[lxc-devel] [lxd/master] Don't translate command names

stgraber on Github lxc-bot at linuxcontainers.org
Tue Sep 15 16:14:22 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200915/ac1afa71/attachment-0001.bin>
-------------- next part --------------
From 086845d82a0c328f682fdb9656773d0245871d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 15 Sep 2020 10:25:30 -0400
Subject: [PATCH 1/3] lxc/utils: Add usage function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/utils.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lxc/utils.go b/lxc/utils.go
index 4935fd4adf..844d93315f 100644
--- a/lxc/utils.go
+++ b/lxc/utils.go
@@ -256,3 +256,11 @@ func getConfig(args ...string) (map[string]string, error) {
 
 	return values, nil
 }
+
+func usage(name string, args ...string) string {
+	if len(args) == 0 {
+		return name
+	}
+
+	return name + " " + args[0]
+}

From c2c07d018da97328a7bcfea61f6345d127a1d774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 15 Sep 2020 12:11:29 -0400
Subject: [PATCH 2/3] lxc: Drop command name from translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #7864

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/action.go          |  8 ++++----
 lxc/alias.go           | 10 +++++-----
 lxc/cluster.go         | 14 +++++++-------
 lxc/config.go          | 12 ++++++------
 lxc/config_device.go   | 32 ++++++++++++++++----------------
 lxc/config_metadata.go |  6 +++---
 lxc/config_template.go | 12 ++++++------
 lxc/config_trust.go    |  8 ++++----
 lxc/console.go         |  2 +-
 lxc/copy.go            |  2 +-
 lxc/delete.go          |  2 +-
 lxc/exec.go            |  2 +-
 lxc/export.go          |  2 +-
 lxc/file.go            | 10 +++++-----
 lxc/image.go           | 20 ++++++++++----------
 lxc/image_alias.go     | 10 +++++-----
 lxc/import.go          |  2 +-
 lxc/info.go            |  2 +-
 lxc/init.go            |  2 +-
 lxc/launch.go          |  2 +-
 lxc/list.go            |  2 +-
 lxc/manpage.go         |  2 +-
 lxc/monitor.go         |  2 +-
 lxc/move.go            |  2 +-
 lxc/network.go         | 32 ++++++++++++++++----------------
 lxc/operation.go       |  8 ++++----
 lxc/profile.go         | 28 ++++++++++++++--------------
 lxc/project.go         | 22 +++++++++++-----------
 lxc/publish.go         |  2 +-
 lxc/query.go           |  2 +-
 lxc/remote.go          | 16 ++++++++--------
 lxc/rename.go          |  2 +-
 lxc/restore.go         |  2 +-
 lxc/snapshot.go        |  2 +-
 lxc/storage.go         | 20 ++++++++++----------
 lxc/storage_volume.go  | 36 ++++++++++++++++++------------------
 lxc/version.go         |  2 +-
 37 files changed, 171 insertions(+), 171 deletions(-)

diff --git a/lxc/action.go b/lxc/action.go
index e102de0ae6..292a82372a 100644
--- a/lxc/action.go
+++ b/lxc/action.go
@@ -26,7 +26,7 @@ func (c *cmdStart) Command() *cobra.Command {
 	c.action = &cmdAction
 
 	cmd := c.action.Command("start")
-	cmd.Use = i18n.G("start [<remote>:]<instance> [[<remote>:]<instance>...]")
+	cmd.Use = usage("start", i18n.G("[<remote>:]<instance> [[<remote>:]<instance>...]"))
 	cmd.Short = i18n.G("Start instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Start instances`))
@@ -45,7 +45,7 @@ func (c *cmdPause) Command() *cobra.Command {
 	c.action = &cmdAction
 
 	cmd := c.action.Command("pause")
-	cmd.Use = i18n.G("pause [<remote>:]<instance> [[<remote>:]<instance>...]")
+	cmd.Use = usage("pause", i18n.G("[<remote>:]<instance> [[<remote>:]<instance>...]"))
 	cmd.Short = i18n.G("Pause instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Pause instances`))
@@ -65,7 +65,7 @@ func (c *cmdRestart) Command() *cobra.Command {
 	c.action = &cmdAction
 
 	cmd := c.action.Command("restart")
-	cmd.Use = i18n.G("restart [<remote>:]<instance> [[<remote>:]<instance>...]")
+	cmd.Use = usage("restart", i18n.G("[<remote>:]<instance> [[<remote>:]<instance>...]"))
 	cmd.Short = i18n.G("Restart instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Restart instances
@@ -86,7 +86,7 @@ func (c *cmdStop) Command() *cobra.Command {
 	c.action = &cmdAction
 
 	cmd := c.action.Command("stop")
-	cmd.Use = i18n.G("stop [<remote>:]<instance> [[<remote>:]<instance>...]")
+	cmd.Use = usage("stop", i18n.G("[<remote>:]<instance> [[<remote>:]<instance>...]"))
 	cmd.Short = i18n.G("Stop instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Stop instances`))
diff --git a/lxc/alias.go b/lxc/alias.go
index b527b632d9..e25e518aea 100644
--- a/lxc/alias.go
+++ b/lxc/alias.go
@@ -17,7 +17,7 @@ type cmdAlias struct {
 
 func (c *cmdAlias) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("alias")
+	cmd.Use = usage("alias")
 	cmd.Short = i18n.G("Manage command aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage command aliases`))
@@ -49,7 +49,7 @@ type cmdAliasAdd struct {
 
 func (c *cmdAliasAdd) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("add <alias> <target>")
+	cmd.Use = usage("add", i18n.G("<alias> <target>"))
 	cmd.Short = i18n.G("Add new aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Add new aliases`))
@@ -94,7 +94,7 @@ type cmdAliasList struct {
 
 func (c *cmdAliasList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list")
+	cmd.Use = usage("list")
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -138,7 +138,7 @@ type cmdAliasRename struct {
 
 func (c *cmdAliasRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename <old alias> <new alias>")
+	cmd.Use = usage("rename", i18n.G("<old alias> <new alias>"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Rename aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -189,7 +189,7 @@ type cmdAliasRemove struct {
 
 func (c *cmdAliasRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remove <alias>")
+	cmd.Use = usage("remove", i18n.G("<alias>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Remove aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
diff --git a/lxc/cluster.go b/lxc/cluster.go
index 9d605990ce..2844acc0fa 100644
--- a/lxc/cluster.go
+++ b/lxc/cluster.go
@@ -26,7 +26,7 @@ type cmdCluster struct {
 
 func (c *cmdCluster) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("cluster")
+	cmd.Use = usage("cluster")
 	cmd.Short = i18n.G("Manage cluster members")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage cluster members`))
@@ -68,7 +68,7 @@ type cmdClusterList struct {
 
 func (c *cmdClusterList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]")
+	cmd.Use = usage("list", i18n.G("[<remote>:]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List all the cluster members")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -149,7 +149,7 @@ type cmdClusterShow struct {
 
 func (c *cmdClusterShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<member>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<member>"))
 	cmd.Short = i18n.G("Show details of a cluster member")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show details of a cluster member`))
@@ -198,7 +198,7 @@ type cmdClusterRename struct {
 
 func (c *cmdClusterRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename [<remote>:]<member> <new-name>")
+	cmd.Use = usage("rename", i18n.G("[<remote>:]<member> <new-name>"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Rename a cluster member")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -248,7 +248,7 @@ type cmdClusterRemove struct {
 
 func (c *cmdClusterRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remove [<remote>:]<member>")
+	cmd.Use = usage("remove", i18n.G("[<remote>:]<member>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Remove a member from the cluster")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -332,7 +332,7 @@ type cmdClusterEnable struct {
 
 func (c *cmdClusterEnable) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("enable [<remote>:] <name>")
+	cmd.Use = usage("enable", i18n.G("[<remote>:] <name>"))
 	cmd.Short = i18n.G("Enable clustering on a single non-clustered LXD server")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Enable clustering on a single non-clustered LXD server
@@ -417,7 +417,7 @@ type cmdClusterEdit struct {
 
 func (c *cmdClusterEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<cluster member>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<cluster member>"))
 	cmd.Short = i18n.G("Edit cluster member configurations as YAML")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit cluster member configurations as YAML`))
diff --git a/lxc/config.go b/lxc/config.go
index 94bb3abe57..e0dd0fcac5 100644
--- a/lxc/config.go
+++ b/lxc/config.go
@@ -25,7 +25,7 @@ type cmdConfig struct {
 
 func (c *cmdConfig) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("config")
+	cmd.Use = usage("config")
 	cmd.Short = i18n.G("Manage instance and server configuration options")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage instance and server configuration options`))
@@ -84,7 +84,7 @@ type cmdConfigEdit struct {
 
 func (c *cmdConfigEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:][<instance>[/<snapshot>]]")
+	cmd.Use = usage("edit", i18n.G("[<remote>:][<instance>[/<snapshot>]]"))
 	cmd.Short = i18n.G("Edit instance or server configurations as YAML")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit instance or server configurations as YAML`))
@@ -355,7 +355,7 @@ type cmdConfigGet struct {
 
 func (c *cmdConfigGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:][<instance>] <key>")
+	cmd.Use = usage("get", i18n.G("[<remote>:][<instance>] <key>"))
 	cmd.Short = i18n.G("Get values for instance or server configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Get values for instance or server configuration keys`))
@@ -447,7 +447,7 @@ type cmdConfigSet struct {
 
 func (c *cmdConfigSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:][<instance>] <key>=<value>...")
+	cmd.Use = usage("set", i18n.G("[<remote>:][<instance>] <key>=<value>..."))
 	cmd.Short = i18n.G("Set instance or server configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Set instance or server configuration keys
@@ -605,7 +605,7 @@ type cmdConfigShow struct {
 
 func (c *cmdConfigShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:][<instance>[/<snapshot>]]")
+	cmd.Use = usage("show", i18n.G("[<remote>:][<instance>[/<snapshot>]]"))
 	cmd.Short = i18n.G("Show instance or server configurations")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show instance or server configurations`))
@@ -729,7 +729,7 @@ type cmdConfigUnset struct {
 
 func (c *cmdConfigUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:][<instance>] <key>")
+	cmd.Use = usage("unset", i18n.G("[<remote>:][<instance>] <key>"))
 	cmd.Short = i18n.G("Unset instance or server configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Unset instance or server configuration keys`))
diff --git a/lxc/config_device.go b/lxc/config_device.go
index 56b6182b05..d6dab2e83a 100644
--- a/lxc/config_device.go
+++ b/lxc/config_device.go
@@ -19,7 +19,7 @@ type cmdConfigDevice struct {
 
 func (c *cmdConfigDevice) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("device")
+	cmd.Use = usage("device")
 	cmd.Short = i18n.G("Manage devices")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage devices`))
@@ -75,12 +75,12 @@ func (c *cmdConfigDeviceAdd) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Add instance devices`))
 	if c.config != nil {
-		cmd.Use = i18n.G("add [<remote>:]<instance> <device> <type> [key=value...]")
+		cmd.Use = usage("add", i18n.G("[<remote>:]<instance> <device> <type> [key=value...]"))
 		cmd.Example = cli.FormatSection("", i18n.G(
 			`lxc config device add [<remote>:]instance1 <device-name> disk source=/share/c1 path=opt
     Will mount the host's /share/c1 onto /opt in the instance.`))
 	} else if c.profile != nil {
-		cmd.Use = i18n.G("add [<remote>:]<profile> <device> <type> [key=value...]")
+		cmd.Use = usage("add", i18n.G("[<remote>:]<profile> <device> <type> [key=value...]"))
 		cmd.Example = cli.FormatSection("", i18n.G(
 			`lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/c1 path=opt
     Will mount the host's /share/c1 onto /opt in the instance.`))
@@ -185,9 +185,9 @@ type cmdConfigDeviceGet struct {
 func (c *cmdConfigDeviceGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	if c.config != nil {
-		cmd.Use = i18n.G("get [<remote>:]<instance> <device> <key>")
+		cmd.Use = usage("get", i18n.G("[<remote>:]<instance> <device> <key>"))
 	} else if c.profile != nil {
-		cmd.Use = i18n.G("get [<remote>:]<profile> <device> <key>")
+		cmd.Use = usage("get", i18n.G("[<remote>:]<profile> <device> <key>"))
 	}
 	cmd.Short = i18n.G("Get values for device configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -265,9 +265,9 @@ func (c *cmdConfigDeviceList) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`List instance devices`))
 	if c.config != nil {
-		cmd.Use = i18n.G("list [<remote>:]<instance>")
+		cmd.Use = usage("list", i18n.G("[<remote>:]<instance>"))
 	} else if c.profile != nil {
-		cmd.Use = i18n.G("list [<remote>:]<profile>")
+		cmd.Use = usage("list", i18n.G("[<remote>:]<profile>"))
 	}
 
 	cmd.RunE = c.Run
@@ -331,7 +331,7 @@ type cmdConfigDeviceOverride struct {
 
 func (c *cmdConfigDeviceOverride) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("override [<remote>:]<instance> <device> [key=value...]")
+	cmd.Use = usage("override", i18n.G("[<remote>:]<instance> <device> [key=value...]"))
 	cmd.Short = i18n.G("Copy profile inherited devices and override configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Copy profile inherited devices and override configuration keys`))
@@ -420,9 +420,9 @@ type cmdConfigDeviceRemove struct {
 func (c *cmdConfigDeviceRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	if c.config != nil {
-		cmd.Use = i18n.G("remove [<remote>:]<instance> <name>...")
+		cmd.Use = usage("remove", i18n.G("[<remote>:]<instance> <name>..."))
 	} else if c.profile != nil {
-		cmd.Use = i18n.G("remove [<remote>:]<profile> <name>...")
+		cmd.Use = usage("remove", i18n.G("[<remote>:]<profile> <name>..."))
 	}
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Remove instance devices")
@@ -516,14 +516,14 @@ func (c *cmdConfigDeviceSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Short = i18n.G("Set device configuration keys")
 	if c.config != nil {
-		cmd.Use = i18n.G("set [<remote>:]<instance> <device> <key>=<value>...")
+		cmd.Use = usage("set", i18n.G("[<remote>:]<instance> <device> <key>=<value>..."))
 		cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 			`Set device configuration keys
 
 For backward compatibility, a single configuration key may still be set with:
     lxc config device set [<remote>:]<instance> <device> <key> <value>`))
 	} else if c.profile != nil {
-		cmd.Use = i18n.G("set [<remote>:]<profile> <device> <key>=<value>...")
+		cmd.Use = usage("set", i18n.G("[<remote>:]<profile> <device> <key>=<value>..."))
 		cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 			`Set device configuration keys
 
@@ -623,9 +623,9 @@ type cmdConfigDeviceShow struct {
 func (c *cmdConfigDeviceShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	if c.config != nil {
-		cmd.Use = i18n.G("show [<remote>:]<instance>")
+		cmd.Use = usage("show", i18n.G("[<remote>:]<instance>"))
 	} else if c.profile != nil {
-		cmd.Use = i18n.G("show [<remote>:]<profile>")
+		cmd.Use = usage("show", i18n.G("[<remote>:]<profile>"))
 	}
 	cmd.Short = i18n.G("Show full device configuration")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -695,9 +695,9 @@ type cmdConfigDeviceUnset struct {
 func (c *cmdConfigDeviceUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	if c.config != nil {
-		cmd.Use = i18n.G("unset [<remote>:]<instance> <device> <key>")
+		cmd.Use = usage("unset", i18n.G("[<remote>:]<instance> <device> <key>"))
 	} else if c.profile != nil {
-		cmd.Use = i18n.G("unset [<remote>:]<profile> <device> <key>")
+		cmd.Use = usage("unset", i18n.G("[<remote>:]<profile> <device> <key>"))
 	}
 	cmd.Short = i18n.G("Unset device configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
diff --git a/lxc/config_metadata.go b/lxc/config_metadata.go
index ad0d2e0646..f99cc9f940 100644
--- a/lxc/config_metadata.go
+++ b/lxc/config_metadata.go
@@ -22,7 +22,7 @@ type cmdConfigMetadata struct {
 
 func (c *cmdConfigMetadata) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("metadata")
+	cmd.Use = usage("metadata")
 	cmd.Short = i18n.G("Manage instance metadata files")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage instance metadata files`))
@@ -47,7 +47,7 @@ type cmdConfigMetadataEdit struct {
 
 func (c *cmdConfigMetadataEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<instance>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<instance>"))
 	cmd.Short = i18n.G("Edit instance metadata files")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit instance metadata files`))
@@ -169,7 +169,7 @@ type cmdConfigMetadataShow struct {
 
 func (c *cmdConfigMetadataShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<instance>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<instance>"))
 	cmd.Short = i18n.G("Show instance metadata files")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show instance metadata files`))
diff --git a/lxc/config_template.go b/lxc/config_template.go
index 60fb8066c9..8e7ce7daa7 100644
--- a/lxc/config_template.go
+++ b/lxc/config_template.go
@@ -23,7 +23,7 @@ type cmdConfigTemplate struct {
 
 func (c *cmdConfigTemplate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("template")
+	cmd.Use = usage("template")
 	cmd.Short = i18n.G("Manage instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage instance file templates`))
@@ -60,7 +60,7 @@ type cmdConfigTemplateCreate struct {
 
 func (c *cmdConfigTemplateCreate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("create [<remote>:]<instance> <template>")
+	cmd.Use = usage("create", i18n.G("[<remote>:]<instance> <template>"))
 	cmd.Short = i18n.G("Create new instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create new instance file templates`))
@@ -102,7 +102,7 @@ type cmdConfigTemplateDelete struct {
 
 func (c *cmdConfigTemplateDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<instance> <template>")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<instance> <template>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -145,7 +145,7 @@ type cmdConfigTemplateEdit struct {
 
 func (c *cmdConfigTemplateEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<instance> <template>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<instance> <template>"))
 	cmd.Short = i18n.G("Edit instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit instance file templates`))
@@ -231,7 +231,7 @@ type cmdConfigTemplateList struct {
 
 func (c *cmdConfigTemplateList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]<instance>")
+	cmd.Use = usage("list", i18n.G("[<remote>:]<instance>"))
 	cmd.Short = i18n.G("List instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`List instance file templates`))
@@ -290,7 +290,7 @@ type cmdConfigTemplateShow struct {
 
 func (c *cmdConfigTemplateShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<instance> <template>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<instance> <template>"))
 	cmd.Short = i18n.G("Show content of instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show content of instance file templates`))
diff --git a/lxc/config_trust.go b/lxc/config_trust.go
index bfe9c20a2c..18857283aa 100644
--- a/lxc/config_trust.go
+++ b/lxc/config_trust.go
@@ -23,7 +23,7 @@ type cmdConfigTrust struct {
 
 func (c *cmdConfigTrust) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("trust")
+	cmd.Use = usage("trust")
 	cmd.Short = i18n.G("Manage trusted clients")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage trusted clients`))
@@ -52,7 +52,7 @@ type cmdConfigTrustAdd struct {
 
 func (c *cmdConfigTrustAdd) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("add [<remote>:] <cert>")
+	cmd.Use = usage("add", i18n.G("[<remote>:] <cert>"))
 	cmd.Short = i18n.G("Add new trusted clients")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Add new trusted clients`))
@@ -109,7 +109,7 @@ type cmdConfigTrustList struct {
 
 func (c *cmdConfigTrustList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]")
+	cmd.Use = usage("list", i18n.G("[<remote>:]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List trusted clients")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -187,7 +187,7 @@ type cmdConfigTrustRemove struct {
 
 func (c *cmdConfigTrustRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remove [<remote>:] <hostname|fingerprint>")
+	cmd.Use = usage("remove", i18n.G("[<remote>:] <hostname|fingerprint>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Remove trusted clients")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
diff --git a/lxc/console.go b/lxc/console.go
index 02e4ae114e..907c39976c 100644
--- a/lxc/console.go
+++ b/lxc/console.go
@@ -31,7 +31,7 @@ type cmdConsole struct {
 
 func (c *cmdConsole) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("console [<remote>:]<instance>")
+	cmd.Use = usage("console", i18n.G("[<remote>:]<instance>"))
 	cmd.Short = i18n.G("Attach to instance consoles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Attach to instance consoles
diff --git a/lxc/copy.go b/lxc/copy.go
index 50f74274be..be3d576f68 100644
--- a/lxc/copy.go
+++ b/lxc/copy.go
@@ -34,7 +34,7 @@ type cmdCopy struct {
 
 func (c *cmdCopy) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]")
+	cmd.Use = usage("copy", i18n.G("[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"))
 	cmd.Aliases = []string{"cp"}
 	cmd.Short = i18n.G("Copy instances within or in between LXD servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
diff --git a/lxc/delete.go b/lxc/delete.go
index b7c0529be2..7bc3caf4f0 100644
--- a/lxc/delete.go
+++ b/lxc/delete.go
@@ -24,7 +24,7 @@ type cmdDelete struct {
 
 func (c *cmdDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete instances and snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
diff --git a/lxc/exec.go b/lxc/exec.go
index f832cfa710..5d1db23c37 100644
--- a/lxc/exec.go
+++ b/lxc/exec.go
@@ -35,7 +35,7 @@ type cmdExec struct {
 
 func (c *cmdExec) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("exec [<remote>:]<instance> [flags] [--] <command line>")
+	cmd.Use = usage("exec", i18n.G("[<remote>:]<instance> [flags] [--] <command line>"))
 	cmd.Short = i18n.G("Execute commands in instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Execute commands in instances
diff --git a/lxc/export.go b/lxc/export.go
index 12ab8c18ea..d670a194fc 100644
--- a/lxc/export.go
+++ b/lxc/export.go
@@ -27,7 +27,7 @@ type cmdExport struct {
 
 func (c *cmdExport) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]")
+	cmd.Use = usage("export", i18n.G("[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"))
 	cmd.Short = i18n.G("Export instance backups")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Export instances as backup tarballs.`))
diff --git a/lxc/file.go b/lxc/file.go
index 82c8fe26b3..77342ad370 100644
--- a/lxc/file.go
+++ b/lxc/file.go
@@ -67,7 +67,7 @@ func fileGetWrapper(server lxd.InstanceServer, inst string, path string) (buf io
 
 func (c *cmdFile) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("file")
+	cmd.Use = usage("file")
 	cmd.Short = i18n.G("Manage files in instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage files in instances`))
@@ -99,7 +99,7 @@ type cmdFileDelete struct {
 
 func (c *cmdFileDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete files in instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -149,7 +149,7 @@ type cmdFileEdit struct {
 
 func (c *cmdFileEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<instance>/<path>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<instance>/<path>"))
 	cmd.Short = i18n.G("Edit files in instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit files in instances`))
@@ -212,7 +212,7 @@ type cmdFilePull struct {
 
 func (c *cmdFilePull) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>")
+	cmd.Use = usage("pull", i18n.G("[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"))
 	cmd.Short = i18n.G("Pull files from instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Pull files from instances`))
@@ -402,7 +402,7 @@ type cmdFilePush struct {
 
 func (c *cmdFilePush) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]")
+	cmd.Use = usage("push", i18n.G("<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"))
 	cmd.Short = i18n.G("Push files into instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Push files into instances`))
diff --git a/lxc/image.go b/lxc/image.go
index a0b33d94be..587bb7102c 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -33,7 +33,7 @@ type cmdImage struct {
 
 func (c *cmdImage) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("image")
+	cmd.Use = usage("image")
 	cmd.Short = i18n.G("Manage images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage images
@@ -123,7 +123,7 @@ type cmdImageCopy struct {
 
 func (c *cmdImageCopy) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("copy [<remote>:]<image> <remote>:")
+	cmd.Use = usage("copy", i18n.G("[<remote>:]<image> <remote>:"))
 	cmd.Aliases = []string{"cp"}
 	cmd.Short = i18n.G("Copy images between servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -271,7 +271,7 @@ type cmdImageDelete struct {
 
 func (c *cmdImageDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<image> [[<remote>:]<image>...]")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<image> [[<remote>:]<image>...]"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -323,7 +323,7 @@ type cmdImageEdit struct {
 
 func (c *cmdImageEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<image>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<image>"))
 	cmd.Short = i18n.G("Edit image properties")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit image properties`))
@@ -448,7 +448,7 @@ type cmdImageExport struct {
 
 func (c *cmdImageExport) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("export [<remote>:]<image> [<target>]")
+	cmd.Use = usage("export", i18n.G("[<remote>:]<image> [<target>]"))
 	cmd.Short = i18n.G("Export and download images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Export and download images
@@ -607,7 +607,7 @@ type cmdImageImport struct {
 
 func (c *cmdImageImport) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]")
+	cmd.Use = usage("import", i18n.G("<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"))
 	cmd.Short = i18n.G("Import images into the image store")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Import image into the image store
@@ -835,7 +835,7 @@ type cmdImageInfo struct {
 
 func (c *cmdImageInfo) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("info [<remote>:]<image>")
+	cmd.Use = usage("info", i18n.G("[<remote>:]<image>"))
 	cmd.Short = i18n.G("Show useful information about images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show useful information about images`))
@@ -969,7 +969,7 @@ type cmdImageList struct {
 
 func (c *cmdImageList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:] [<filter>...]")
+	cmd.Use = usage("list", i18n.G("[<remote>:] [<filter>...]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -1268,7 +1268,7 @@ type cmdImageRefresh struct {
 
 func (c *cmdImageRefresh) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("refresh [<remote>:]<image> [[<remote>:]<image>...]")
+	cmd.Use = usage("refresh", i18n.G("[<remote>:]<image> [[<remote>:]<image>...]"))
 	cmd.Short = i18n.G("Refresh images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Refresh images`))
@@ -1347,7 +1347,7 @@ type cmdImageShow struct {
 
 func (c *cmdImageShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<image>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<image>"))
 	cmd.Short = i18n.G("Show image properties")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show image properties`))
diff --git a/lxc/image_alias.go b/lxc/image_alias.go
index 2c7b81b2ff..b7e941b84e 100644
--- a/lxc/image_alias.go
+++ b/lxc/image_alias.go
@@ -20,7 +20,7 @@ type cmdImageAlias struct {
 
 func (c *cmdImageAlias) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("alias")
+	cmd.Use = usage("alias")
 	cmd.Short = i18n.G("Manage image aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage image aliases`))
@@ -53,7 +53,7 @@ type cmdImageAliasCreate struct {
 
 func (c *cmdImageAliasCreate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("create [<remote>:]<alias> <fingerprint>")
+	cmd.Use = usage("create", i18n.G("[<remote>:]<alias> <fingerprint>"))
 	cmd.Short = i18n.G("Create aliases for existing images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create aliases for existing images`))
@@ -99,7 +99,7 @@ type cmdImageAliasDelete struct {
 
 func (c *cmdImageAliasDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<alias>")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<alias>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete image aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -144,7 +144,7 @@ type cmdImageAliasList struct {
 
 func (c *cmdImageAliasList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:] [<filters>...]")
+	cmd.Use = usage("list", i18n.G("[<remote>:] [<filters>...]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List image aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -246,7 +246,7 @@ type cmdImageAliasRename struct {
 
 func (c *cmdImageAliasRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename [<remote>:]<alias> <new-name>")
+	cmd.Use = usage("rename", i18n.G("[<remote>:]<alias> <new-name>"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Rename aliases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
diff --git a/lxc/import.go b/lxc/import.go
index 8a3016648c..06d3974747 100644
--- a/lxc/import.go
+++ b/lxc/import.go
@@ -23,7 +23,7 @@ type cmdImport struct {
 
 func (c *cmdImport) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("import [<remote>:] <backup file>")
+	cmd.Use = usage("import", i18n.G("[<remote>:] <backup file>"))
 	cmd.Short = i18n.G("Import instance backups")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Import backups of instances including their snapshots.`))
diff --git a/lxc/info.go b/lxc/info.go
index ea9156ff45..b1be66ff43 100644
--- a/lxc/info.go
+++ b/lxc/info.go
@@ -28,7 +28,7 @@ type cmdInfo struct {
 
 func (c *cmdInfo) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("info [<remote>:][<instance>]")
+	cmd.Use = usage("info", i18n.G("[<remote>:][<instance>]"))
 	cmd.Short = i18n.G("Show instance or server information")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show instance or server information`))
diff --git a/lxc/init.go b/lxc/init.go
index d4a0693a88..ab04aa9f72 100644
--- a/lxc/init.go
+++ b/lxc/init.go
@@ -35,7 +35,7 @@ type cmdInit struct {
 
 func (c *cmdInit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("init [[<remote>:]<image>] [<remote>:][<name>] [< config")
+	cmd.Use = usage("init", i18n.G("[[<remote>:]<image>] [<remote>:][<name>] [< config"))
 	cmd.Short = i18n.G("Create instances from images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(`Create instances from images`))
 	cmd.Example = cli.FormatSection("", i18n.G(`lxc init ubuntu:18.04 u1
diff --git a/lxc/launch.go b/lxc/launch.go
index 384edbd1bc..052f9c9c10 100644
--- a/lxc/launch.go
+++ b/lxc/launch.go
@@ -20,7 +20,7 @@ type cmdLaunch struct {
 
 func (c *cmdLaunch) Command() *cobra.Command {
 	cmd := c.init.Command()
-	cmd.Use = i18n.G("launch [<remote>:]<image> [<remote>:][<name>]")
+	cmd.Use = usage("launch", i18n.G("[<remote>:]<image> [<remote>:][<name>]"))
 	cmd.Short = i18n.G("Create and start instances from images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create and start instances from images`))
diff --git a/lxc/list.go b/lxc/list.go
index fb67bc5356..be0b2aeeb6 100644
--- a/lxc/list.go
+++ b/lxc/list.go
@@ -39,7 +39,7 @@ type cmdList struct {
 
 func (c *cmdList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:] [<filter>...]")
+	cmd.Use = usage("list", i18n.G("[<remote>:] [<filter>...]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
diff --git a/lxc/manpage.go b/lxc/manpage.go
index 1b309fd2e8..f3893a15e5 100644
--- a/lxc/manpage.go
+++ b/lxc/manpage.go
@@ -15,7 +15,7 @@ type cmdManpage struct {
 
 func (c *cmdManpage) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("manpage <target>")
+	cmd.Use = usage("manpage", i18n.G("<target>"))
 	cmd.Short = i18n.G("Generate manpages for all commands")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Generate manpages for all commands`))
diff --git a/lxc/monitor.go b/lxc/monitor.go
index 22f98cfc7b..b777e8a57d 100644
--- a/lxc/monitor.go
+++ b/lxc/monitor.go
@@ -25,7 +25,7 @@ type cmdMonitor struct {
 
 func (c *cmdMonitor) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("monitor [<remote>:]")
+	cmd.Use = usage("monitor", i18n.G("[<remote>:]"))
 	cmd.Short = i18n.G("Monitor a local or remote LXD server")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Monitor a local or remote LXD server
diff --git a/lxc/move.go b/lxc/move.go
index 5a6a0fbba5..182021c0f4 100644
--- a/lxc/move.go
+++ b/lxc/move.go
@@ -30,7 +30,7 @@ type cmdMove struct {
 
 func (c *cmdMove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]")
+	cmd.Use = usage("move", i18n.G("[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Move instances within or in between LXD servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
diff --git a/lxc/network.go b/lxc/network.go
index 2ec0e16cc0..17980f40c2 100644
--- a/lxc/network.go
+++ b/lxc/network.go
@@ -28,7 +28,7 @@ type cmdNetwork struct {
 
 func (c *cmdNetwork) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("network")
+	cmd.Use = usage("network")
 	cmd.Short = i18n.G("Manage and attach instances to networks")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage and attach instances to networks`))
@@ -104,7 +104,7 @@ type cmdNetworkAttach struct {
 
 func (c *cmdNetworkAttach) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("attach [<remote>:]<network> <instance> [<device name>] [<interface name>]")
+	cmd.Use = usage("attach", i18n.G("[<remote>:]<network> <instance> [<device name>] [<interface name>]"))
 	cmd.Short = i18n.G("Attach network interfaces to instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Attach new network interfaces to instances`))
@@ -177,7 +177,7 @@ type cmdNetworkAttachProfile struct {
 
 func (c *cmdNetworkAttachProfile) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("attach-profile [<remote>:]<network> <profile> [<device name>] [<interface name>]")
+	cmd.Use = usage("attach-profile", i18n.G("[<remote>:]<network> <profile> [<device name>] [<interface name>]"))
 	cmd.Short = i18n.G("Attach network interfaces to profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Attach network interfaces to profiles`))
@@ -250,7 +250,7 @@ type cmdNetworkCreate struct {
 
 func (c *cmdNetworkCreate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("create [<remote>:]<network> [key=value...]")
+	cmd.Use = usage("create", i18n.G("[<remote>:]<network> [key=value...]"))
 	cmd.Short = i18n.G("Create new networks")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(`Create new networks`))
 
@@ -323,7 +323,7 @@ type cmdNetworkDelete struct {
 
 func (c *cmdNetworkDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<network>")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<network>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete networks")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -374,7 +374,7 @@ type cmdNetworkDetach struct {
 
 func (c *cmdNetworkDetach) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("detach [<remote>:]<network> <instance> [<device name>]")
+	cmd.Use = usage("detach", i18n.G("[<remote>:]<network> <instance> [<device name>]"))
 	cmd.Short = i18n.G("Detach network interfaces from instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Detach network interfaces from instances`))
@@ -459,7 +459,7 @@ type cmdNetworkDetachProfile struct {
 
 func (c *cmdNetworkDetachProfile) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("detach-profile [<remote>:]<network> <profile> [<device name>]")
+	cmd.Use = usage("detach-profile", i18n.G("[<remote>:]<network> <profile> [<device name>]"))
 	cmd.Short = i18n.G("Detach network interfaces from profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Detach network interfaces from profiles`))
@@ -544,7 +544,7 @@ type cmdNetworkEdit struct {
 
 func (c *cmdNetworkEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<network>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<network>"))
 	cmd.Short = i18n.G("Edit network configurations as YAML")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit network configurations as YAML`))
@@ -667,7 +667,7 @@ type cmdNetworkGet struct {
 
 func (c *cmdNetworkGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:]<network> <key>")
+	cmd.Use = usage("get", i18n.G("[<remote>:]<network> <key>"))
 	cmd.Short = i18n.G("Get values for network configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Get values for network configuration keys`))
@@ -725,7 +725,7 @@ type cmdNetworkInfo struct {
 
 func (c *cmdNetworkInfo) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("info [<remote>:]<network>")
+	cmd.Use = usage("info", i18n.G("[<remote>:]<network>"))
 	cmd.Short = i18n.G("Get runtime information on networks")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Get runtime information on networks`))
@@ -804,7 +804,7 @@ type cmdNetworkList struct {
 
 func (c *cmdNetworkList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]")
+	cmd.Use = usage("list", i18n.G("[<remote>:]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List available networks")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -900,7 +900,7 @@ type cmdNetworkListLeases struct {
 
 func (c *cmdNetworkListLeases) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list-leases [<remote>:]<network>")
+	cmd.Use = usage("list-leases", i18n.G("[<remote>:]<network>"))
 	cmd.Short = i18n.G("List DHCP leases")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`List DHCP leases`))
@@ -968,7 +968,7 @@ type cmdNetworkRename struct {
 
 func (c *cmdNetworkRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename [<remote>:]<network> <new-name>")
+	cmd.Use = usage("rename", i18n.G("[<remote>:]<network> <new-name>"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Rename networks")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -1019,7 +1019,7 @@ type cmdNetworkSet struct {
 
 func (c *cmdNetworkSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:]<network> <key>=<value>...")
+	cmd.Use = usage("set", i18n.G("[<remote>:]<network> <key>=<value>..."))
 	cmd.Short = i18n.G("Set network configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Set network configuration keys
@@ -1089,7 +1089,7 @@ type cmdNetworkShow struct {
 
 func (c *cmdNetworkShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<network>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<network>"))
 	cmd.Short = i18n.G("Show network configurations")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show network configurations`))
@@ -1151,7 +1151,7 @@ type cmdNetworkUnset struct {
 
 func (c *cmdNetworkUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:]<network> <key>")
+	cmd.Use = usage("unset", i18n.G("[<remote>:]<network> <key>"))
 	cmd.Short = i18n.G("Unset network configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Unset network configuration keys`))
diff --git a/lxc/operation.go b/lxc/operation.go
index 486eb2f7ad..1f2965e7e6 100644
--- a/lxc/operation.go
+++ b/lxc/operation.go
@@ -19,7 +19,7 @@ type cmdOperation struct {
 
 func (c *cmdOperation) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("operation")
+	cmd.Use = usage("operation")
 	cmd.Short = i18n.G("List, show and delete background operations")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`List, show and delete background operations`))
@@ -47,7 +47,7 @@ type cmdOperationDelete struct {
 
 func (c *cmdOperationDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<operation>")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<operation>"))
 	cmd.Aliases = []string{"cancel", "rm"}
 	cmd.Short = i18n.G("Delete a background operation (will attempt to cancel)")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -96,7 +96,7 @@ type cmdOperationList struct {
 
 func (c *cmdOperationList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]")
+	cmd.Use = usage("list", i18n.G("[<remote>:]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List background operations")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -176,7 +176,7 @@ type cmdOperationShow struct {
 
 func (c *cmdOperationShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<operation>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<operation>"))
 	cmd.Short = i18n.G("Show details on a background operation")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show details on a background operation`))
diff --git a/lxc/profile.go b/lxc/profile.go
index 2a1f37b1dc..7bf56518b7 100644
--- a/lxc/profile.go
+++ b/lxc/profile.go
@@ -24,7 +24,7 @@ type cmdProfile struct {
 
 func (c *cmdProfile) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("profile")
+	cmd.Use = usage("profile")
 	cmd.Short = i18n.G("Manage profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage profiles`))
@@ -96,7 +96,7 @@ type cmdProfileAdd struct {
 
 func (c *cmdProfileAdd) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("add [<remote>:]<instance> <profile>")
+	cmd.Use = usage("add", i18n.G("[<remote>:]<instance> <profile>"))
 	cmd.Short = i18n.G("Add profiles to instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Add profiles to instances`))
@@ -158,7 +158,7 @@ type cmdProfileAssign struct {
 
 func (c *cmdProfileAssign) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("assign [<remote>:]<instance> <profiles>")
+	cmd.Use = usage("assign", i18n.G("[<remote>:]<instance> <profiles>"))
 	cmd.Aliases = []string{"apply"}
 	cmd.Short = i18n.G("Assign sets of profiles to instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -238,7 +238,7 @@ type cmdProfileCopy struct {
 
 func (c *cmdProfileCopy) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("copy [<remote>:]<profile> [<remote>:]<profile>")
+	cmd.Use = usage("copy", i18n.G("[<remote>:]<profile> [<remote>:]<profile>"))
 	cmd.Aliases = []string{"cp"}
 	cmd.Short = i18n.G("Copy profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -295,7 +295,7 @@ type cmdProfileCreate struct {
 
 func (c *cmdProfileCreate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("create [<remote>:]<profile>")
+	cmd.Use = usage("create", i18n.G("[<remote>:]<profile>"))
 	cmd.Short = i18n.G("Create profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create profiles`))
@@ -348,7 +348,7 @@ type cmdProfileDelete struct {
 
 func (c *cmdProfileDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<profile>")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<profile>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -399,7 +399,7 @@ type cmdProfileEdit struct {
 
 func (c *cmdProfileEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<profile>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<profile>"))
 	cmd.Short = i18n.G("Edit profile configurations as YAML")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit profile configurations as YAML`))
@@ -523,7 +523,7 @@ type cmdProfileGet struct {
 
 func (c *cmdProfileGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:]<profile> <key>")
+	cmd.Use = usage("get", i18n.G("[<remote>:]<profile> <key>"))
 	cmd.Short = i18n.G("Get values for profile configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Get values for profile configuration keys`))
@@ -571,7 +571,7 @@ type cmdProfileList struct {
 
 func (c *cmdProfileList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]")
+	cmd.Use = usage("list", i18n.G("[<remote>:]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -631,7 +631,7 @@ type cmdProfileRemove struct {
 
 func (c *cmdProfileRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remove [<remote>:]<instance> <profile>")
+	cmd.Use = usage("remove", i18n.G("[<remote>:]<instance> <profile>"))
 	cmd.Short = i18n.G("Remove profiles from instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Remove profiles from instances`))
@@ -706,7 +706,7 @@ type cmdProfileRename struct {
 
 func (c *cmdProfileRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename [<remote>:]<profile> <new-name>")
+	cmd.Use = usage("rename", i18n.G("[<remote>:]<profile> <new-name>"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Rename profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -757,7 +757,7 @@ type cmdProfileSet struct {
 
 func (c *cmdProfileSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:]<profile> <key><value>...")
+	cmd.Use = usage("set", i18n.G("[<remote>:]<profile> <key><value>..."))
 	cmd.Short = i18n.G("Set profile configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Set profile configuration keys
@@ -816,7 +816,7 @@ type cmdProfileShow struct {
 
 func (c *cmdProfileShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<profile>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<profile>"))
 	cmd.Short = i18n.G("Show profile configurations")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show profile configurations`))
@@ -870,7 +870,7 @@ type cmdProfileUnset struct {
 
 func (c *cmdProfileUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:]<profile> <key>")
+	cmd.Use = usage("unset", i18n.G("[<remote>:]<profile> <key>"))
 	cmd.Short = i18n.G("Unset profile configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Unset profile configuration keys`))
diff --git a/lxc/project.go b/lxc/project.go
index d5a360ce3a..194ad0c52e 100644
--- a/lxc/project.go
+++ b/lxc/project.go
@@ -24,7 +24,7 @@ type cmdProject struct {
 
 func (c *cmdProject) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("project")
+	cmd.Use = usage("project")
 	cmd.Short = i18n.G("Manage projects")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage projects`))
@@ -81,7 +81,7 @@ type cmdProjectCreate struct {
 
 func (c *cmdProjectCreate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("create [<remote>:]<project>")
+	cmd.Use = usage("create", i18n.G("[<remote>:]<project>"))
 	cmd.Short = i18n.G("Create projects")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create projects`))
@@ -145,7 +145,7 @@ type cmdProjectDelete struct {
 
 func (c *cmdProjectDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<project>")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<project>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete projects")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -209,7 +209,7 @@ type cmdProjectEdit struct {
 
 func (c *cmdProjectEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<project>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<project>"))
 	cmd.Short = i18n.G("Edit project configurations as YAML")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit project configurations as YAML`))
@@ -329,7 +329,7 @@ type cmdProjectGet struct {
 
 func (c *cmdProjectGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:]<project> <key>")
+	cmd.Use = usage("get", i18n.G("[<remote>:]<project> <key>"))
 	cmd.Short = i18n.G("Get values for project configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Get values for project configuration keys`))
@@ -378,7 +378,7 @@ type cmdProjectList struct {
 
 func (c *cmdProjectList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]")
+	cmd.Use = usage("list", i18n.G("[<remote>:]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List projects")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -476,7 +476,7 @@ type cmdProjectRename struct {
 
 func (c *cmdProjectRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename [<remote>:]<project> <new-name>")
+	cmd.Use = usage("rename", i18n.G("[<remote>:]<project> <new-name>"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Rename projects")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -532,7 +532,7 @@ type cmdProjectSet struct {
 
 func (c *cmdProjectSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:]<project> <key>=<value>...")
+	cmd.Use = usage("set", i18n.G("[<remote>:]<project> <key>=<value>..."))
 	cmd.Short = i18n.G("Set project configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Set project configuration keys
@@ -592,7 +592,7 @@ type cmdProjectUnset struct {
 
 func (c *cmdProjectUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:]<project> <key>")
+	cmd.Use = usage("unset", i18n.G("[<remote>:]<project> <key>"))
 	cmd.Short = i18n.G("Unset project configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Unset project configuration keys`))
@@ -621,7 +621,7 @@ type cmdProjectShow struct {
 
 func (c *cmdProjectShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<project>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<project>"))
 	cmd.Short = i18n.G("Show project options")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show project options`))
@@ -674,7 +674,7 @@ type cmdProjectSwitch struct {
 
 func (c *cmdProjectSwitch) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("switch [<remote>:]<project>")
+	cmd.Use = usage("switch", i18n.G("[<remote>:]<project>"))
 	cmd.Short = i18n.G("Switch the current project")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Switch the current project`))
diff --git a/lxc/publish.go b/lxc/publish.go
index 6af03250a9..ff1e3575b4 100644
--- a/lxc/publish.go
+++ b/lxc/publish.go
@@ -26,7 +26,7 @@ type cmdPublish struct {
 
 func (c *cmdPublish) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]")
+	cmd.Use = usage("publish", i18n.G("[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"))
 	cmd.Short = i18n.G("Publish instances as images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Publish instances as images`))
diff --git a/lxc/query.go b/lxc/query.go
index f3a69b6804..29e58de88a 100644
--- a/lxc/query.go
+++ b/lxc/query.go
@@ -27,7 +27,7 @@ type cmdQuery struct {
 
 func (c *cmdQuery) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("query [<remote>:]<API path>")
+	cmd.Use = usage("query", i18n.G("[<remote>:]<API path>"))
 	cmd.Short = i18n.G("Send a raw query to LXD")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Send a raw query to LXD`))
diff --git a/lxc/remote.go b/lxc/remote.go
index 1552675dee..5042779c62 100644
--- a/lxc/remote.go
+++ b/lxc/remote.go
@@ -28,7 +28,7 @@ type cmdRemote struct {
 
 func (c *cmdRemote) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remote")
+	cmd.Use = usage("remote")
 	cmd.Short = i18n.G("Manage the list of remote servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage the list of remote servers`))
@@ -79,7 +79,7 @@ type cmdRemoteAdd struct {
 
 func (c *cmdRemoteAdd) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("add [<remote>] <IP|FQDN|URL>")
+	cmd.Use = usage("add", i18n.G("[<remote>] <IP|FQDN|URL>"))
 	cmd.Short = i18n.G("Add new remote servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Add new remote servers
@@ -418,7 +418,7 @@ type cmdRemoteGetDefault struct {
 
 func (c *cmdRemoteGetDefault) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get-default")
+	cmd.Use = usage("get-default")
 	cmd.Short = i18n.G("Show the default remote")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show the default remote`))
@@ -453,7 +453,7 @@ type cmdRemoteList struct {
 
 func (c *cmdRemoteList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list")
+	cmd.Use = usage("list")
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List the available remotes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -533,7 +533,7 @@ type cmdRemoteRename struct {
 
 func (c *cmdRemoteRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename <remote> <new-name>")
+	cmd.Use = usage("rename", i18n.G("<remote> <new-name>"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Rename remotes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -595,7 +595,7 @@ type cmdRemoteRemove struct {
 
 func (c *cmdRemoteRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remove <remote>")
+	cmd.Use = usage("remove", i18n.G("<remote>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Remove remotes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -646,7 +646,7 @@ type cmdRemoteSwitch struct {
 func (c *cmdRemoteSwitch) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Aliases = []string{"set-default"}
-	cmd.Use = i18n.G("switch <remote>")
+	cmd.Use = usage("switch", i18n.G("<remote>"))
 	cmd.Short = i18n.G("Switch the default remote")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Switch the default remote`))
@@ -684,7 +684,7 @@ type cmdRemoteSetURL struct {
 
 func (c *cmdRemoteSetURL) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set-url <remote> <URL>")
+	cmd.Use = usage("set-url", i18n.G("<remote> <URL>"))
 	cmd.Short = i18n.G("Set the URL for the remote")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Set the URL for the remote`))
diff --git a/lxc/rename.go b/lxc/rename.go
index abe6c1f785..603c305725 100644
--- a/lxc/rename.go
+++ b/lxc/rename.go
@@ -16,7 +16,7 @@ type cmdRename struct {
 
 func (c *cmdRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]")
+	cmd.Use = usage("rename", i18n.G("[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"))
 	cmd.Short = i18n.G("Rename instances and snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Rename instances and snapshots`))
diff --git a/lxc/restore.go b/lxc/restore.go
index 82da4038a0..b40440edeb 100644
--- a/lxc/restore.go
+++ b/lxc/restore.go
@@ -19,7 +19,7 @@ type cmdRestore struct {
 
 func (c *cmdRestore) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("restore [<remote>:]<instance> <snapshot>")
+	cmd.Use = usage("restore", i18n.G("[<remote>:]<instance> <snapshot>"))
 	cmd.Short = i18n.G("Restore instances from snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Restore instaces from snapshots
diff --git a/lxc/snapshot.go b/lxc/snapshot.go
index e54fe63640..e601edd444 100644
--- a/lxc/snapshot.go
+++ b/lxc/snapshot.go
@@ -22,7 +22,7 @@ type cmdSnapshot struct {
 
 func (c *cmdSnapshot) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("snapshot [<remote>:]<instance> [<snapshot name>]")
+	cmd.Use = usage("snapshot", i18n.G("[<remote>:]<instance> [<snapshot name>]"))
 	cmd.Short = i18n.G("Create instance snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create instance snapshots
diff --git a/lxc/storage.go b/lxc/storage.go
index 613b5c9076..c7d881d7d4 100644
--- a/lxc/storage.go
+++ b/lxc/storage.go
@@ -28,7 +28,7 @@ type cmdStorage struct {
 
 func (c *cmdStorage) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("storage")
+	cmd.Use = usage("storage")
 	cmd.Short = i18n.G("Manage storage pools and volumes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage storage pools and volumes`))
@@ -84,7 +84,7 @@ type cmdStorageCreate struct {
 
 func (c *cmdStorageCreate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("create [<remote>:]<pool> <driver> [key=value...]")
+	cmd.Use = usage("create", i18n.G("[<remote>:]<pool> <driver> [key=value...]"))
 	cmd.Short = i18n.G("Create storage pools")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create storage pools`))
@@ -157,7 +157,7 @@ type cmdStorageDelete struct {
 
 func (c *cmdStorageDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<pool>")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<pool>"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete storage pools")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -208,7 +208,7 @@ type cmdStorageEdit struct {
 
 func (c *cmdStorageEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<pool>")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<pool>"))
 	cmd.Short = i18n.G("Edit storage pool configurations as YAML")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit storage pool configurations as YAML`))
@@ -328,7 +328,7 @@ type cmdStorageGet struct {
 
 func (c *cmdStorageGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:]<pool> <key>")
+	cmd.Use = usage("get", i18n.G("[<remote>:]<pool> <key>"))
 	cmd.Short = i18n.G("Get values for storage pool configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Get values for storage pool configuration keys`))
@@ -383,7 +383,7 @@ type cmdStorageInfo struct {
 
 func (c *cmdStorageInfo) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("info [<remote>:]<pool>")
+	cmd.Use = usage("info", i18n.G("[<remote>:]<pool>"))
 	cmd.Short = i18n.G("Show useful information about storage pools")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show useful information about storage pools`))
@@ -502,7 +502,7 @@ type cmdStorageList struct {
 
 func (c *cmdStorageList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]")
+	cmd.Use = usage("list", i18n.G("[<remote>:]"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List available storage pools")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -577,7 +577,7 @@ type cmdStorageSet struct {
 
 func (c *cmdStorageSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:]<pool> <key> <value>")
+	cmd.Use = usage("set", i18n.G("[<remote>:]<pool> <key> <value>"))
 	cmd.Short = i18n.G("Set storage pool configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Set storage pool configuration keys
@@ -646,7 +646,7 @@ type cmdStorageShow struct {
 
 func (c *cmdStorageShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<pool>")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<pool>"))
 	cmd.Short = i18n.G("Show storage pool configurations and resources")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show storage pool configurations and resources`))
@@ -730,7 +730,7 @@ type cmdStorageUnset struct {
 
 func (c *cmdStorageUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:]<pool> <key>")
+	cmd.Use = usage("unset", i18n.G("[<remote>:]<pool> <key>"))
 	cmd.Short = i18n.G("Unset storage pool configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Unset storage pool configuration keys`))
diff --git a/lxc/storage_volume.go b/lxc/storage_volume.go
index 78ebdd6e0a..93e7794b1e 100644
--- a/lxc/storage_volume.go
+++ b/lxc/storage_volume.go
@@ -28,7 +28,7 @@ type cmdStorageVolume struct {
 
 func (c *cmdStorageVolume) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("volume")
+	cmd.Use = usage("volume")
 	cmd.Short = i18n.G("Manage storage volumes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage storage volumes
@@ -135,7 +135,7 @@ type cmdStorageVolumeAttach struct {
 
 func (c *cmdStorageVolumeAttach) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>")
+	cmd.Use = usage("attach", i18n.G("[<remote>:]<pool> <volume> <instance> [<device name>] <path>"))
 	cmd.Short = i18n.G("Attach new storage volumes to instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Attach new storage volumes to instances`))
@@ -218,7 +218,7 @@ type cmdStorageVolumeAttachProfile struct {
 
 func (c *cmdStorageVolumeAttachProfile) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>")
+	cmd.Use = usage("attach-profile", i18n.G("[<remote:>]<pool> <volume> <profile> [<device name>] <path>"))
 	cmd.Short = i18n.G("Attach new storage volumes to profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Attach new storage volumes to profiles`))
@@ -304,7 +304,7 @@ type cmdStorageVolumeCopy struct {
 
 func (c *cmdStorageVolumeCopy) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("copy <pool>/<volume>[/<snapshot>] <pool>/<volume>")
+	cmd.Use = usage("copy", i18n.G("<pool>/<volume>[/<snapshot>] <pool>/<volume>"))
 	cmd.Aliases = []string{"cp"}
 	cmd.Short = i18n.G("Copy storage volumes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -467,7 +467,7 @@ type cmdStorageVolumeCreate struct {
 
 func (c *cmdStorageVolumeCreate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("create [<remote>:]<pool> <volume> [key=value...]")
+	cmd.Use = usage("create", i18n.G("[<remote>:]<pool> <volume> [key=value...]"))
 	cmd.Short = i18n.G("Create new custom storage volumes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create new custom storage volumes`))
@@ -545,7 +545,7 @@ type cmdStorageVolumeDelete struct {
 
 func (c *cmdStorageVolumeDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<pool> <volume>[/<snapshot>]")
+	cmd.Use = usage("delete", i18n.G("[<remote>:]<pool> <volume>[/<snapshot>]"))
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Delete storage volumes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -622,7 +622,7 @@ type cmdStorageVolumeDetach struct {
 
 func (c *cmdStorageVolumeDetach) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("detach [<remote>:]<pool> <volume> <instance> [<device name>]")
+	cmd.Use = usage("detach", i18n.G("[<remote>:]<pool> <volume> <instance> [<device name>]"))
 	cmd.Short = i18n.G("Detach storage volumes from instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Detach storage volumes from instances`))
@@ -704,7 +704,7 @@ type cmdStorageVolumeDetachProfile struct {
 
 func (c *cmdStorageVolumeDetachProfile) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]")
+	cmd.Use = usage("detach-profile", i18n.G("[<remote:>]<pool> <volume> <profile> [<device name>]"))
 	cmd.Short = i18n.G("Detach storage volumes from profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Detach storage volumes from profiles`))
@@ -785,7 +785,7 @@ type cmdStorageVolumeEdit struct {
 
 func (c *cmdStorageVolumeEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<pool> <volume>[/<snapshot>]")
+	cmd.Use = usage("edit", i18n.G("[<remote>:]<pool> <volume>[/<snapshot>]"))
 	cmd.Short = i18n.G("Edit storage volume configurations as YAML")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Edit storage volume configurations as YAML`))
@@ -985,7 +985,7 @@ type cmdStorageVolumeGet struct {
 
 func (c *cmdStorageVolumeGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:]<pool> <volume>[/<snapshot>] <key>")
+	cmd.Use = usage("get", i18n.G("[<remote>:]<pool> <volume>[/<snapshot>] <key>"))
 	cmd.Short = i18n.G("Get values for storage volume configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Get values for storage volume configuration keys`))
@@ -1075,7 +1075,7 @@ type cmdStorageVolumeList struct {
 
 func (c *cmdStorageVolumeList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]<pool>")
+	cmd.Use = usage("list", i18n.G("[<remote>:]<pool>"))
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List storage volumes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -1155,7 +1155,7 @@ type cmdStorageVolumeMove struct {
 
 func (c *cmdStorageVolumeMove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("move <pool>/<volume> <pool>/<volume>")
+	cmd.Use = usage("move", i18n.G("<pool>/<volume> <pool>/<volume>"))
 	cmd.Aliases = []string{"mv"}
 	cmd.Short = i18n.G("Move storage volumes between pools")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -1187,7 +1187,7 @@ type cmdStorageVolumeRename struct {
 
 func (c *cmdStorageVolumeRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot name>]")
+	cmd.Use = usage("rename", i18n.G("[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot name>]"))
 	cmd.Short = i18n.G("Rename storage volumes and storage volume snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Rename storage volumes`))
@@ -1300,7 +1300,7 @@ type cmdStorageVolumeSet struct {
 
 func (c *cmdStorageVolumeSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:]<pool> <volume> <key>=<value>...")
+	cmd.Use = usage("set", i18n.G("[<remote>:]<pool> <volume> <key>=<value>..."))
 	cmd.Short = i18n.G("Set storage volume configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Set storage volume configuration keys
@@ -1376,7 +1376,7 @@ type cmdStorageVolumeShow struct {
 
 func (c *cmdStorageVolumeShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<pool> <volume>[/<snapshot>]")
+	cmd.Use = usage("show", i18n.G("[<remote>:]<pool> <volume>[/<snapshot>]"))
 	cmd.Short = i18n.G("Show storage volume configurations")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show storage volume configurations`))
@@ -1475,7 +1475,7 @@ type cmdStorageVolumeUnset struct {
 
 func (c *cmdStorageVolumeUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:]<pool> <volume> <key>")
+	cmd.Use = usage("unset", i18n.G("[<remote>:]<pool> <volume> <key>"))
 	cmd.Short = i18n.G("Unset storage volume configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Unset storage volume configuration keys`))
@@ -1508,7 +1508,7 @@ type cmdStorageVolumeSnapshot struct {
 
 func (c *cmdStorageVolumeSnapshot) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("snapshot [<remote>:]<pool> <volume> [<snapshot>]")
+	cmd.Use = usage("snapshot", i18n.G("[<remote>:]<pool> <volume> [<snapshot>]"))
 	cmd.Short = i18n.G("Snapshot storage volumes")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Snapshot storage volumes`))
@@ -1584,7 +1584,7 @@ type cmdStorageVolumeRestore struct {
 
 func (c *cmdStorageVolumeRestore) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("restore [<remote>:]<pool> <volume> <snapshot>")
+	cmd.Use = usage("restore", i18n.G("[<remote>:]<pool> <volume> <snapshot>"))
 	cmd.Short = i18n.G("Restore storage volume snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Restore storage volume snapshots`))
diff --git a/lxc/version.go b/lxc/version.go
index a4a0179078..ff562247cc 100644
--- a/lxc/version.go
+++ b/lxc/version.go
@@ -17,7 +17,7 @@ type cmdVersion struct {
 
 func (c *cmdVersion) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("version [<remote>:]")
+	cmd.Use = usage("version", i18n.G("[<remote>:]"))
 	cmd.Short = i18n.G("Show local and remote versions")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show local and remote versions`))

From 68f2dbfbf5e16f2566ea0e994efc501706e34540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 15 Sep 2020 12:12:31 -0400
Subject: [PATCH 3/3] i18n: Update translation template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 po/bg.po      |  757 ++++++++---------------
 po/ca.po      |  757 ++++++++---------------
 po/de.po      | 1571 ++++++++++++++++++++++++------------------------
 po/el.po      |  757 ++++++++---------------
 po/es.po      | 1037 ++++++++++++++------------------
 po/fa.po      |  757 ++++++++---------------
 po/fi.po      |  757 ++++++++---------------
 po/fr.po      | 1598 +++++++++++++++++++++++++------------------------
 po/hi.po      |  757 ++++++++---------------
 po/id.po      |  757 ++++++++---------------
 po/it.po      | 1039 ++++++++++++++------------------
 po/ja.po      | 1186 ++++++++++++++++++------------------
 po/ko.po      |  757 ++++++++---------------
 po/lxd.pot    |  726 ++++++++--------------
 po/nb_NO.po   |  757 ++++++++---------------
 po/nl.po      |  757 ++++++++---------------
 po/pa.po      |  757 ++++++++---------------
 po/pl.po      |  757 ++++++++---------------
 po/pt_BR.po   |  767 ++++++++----------------
 po/ru.po      | 1523 +++++++++++++++++++++++-----------------------
 po/sl.po      |  757 ++++++++---------------
 po/sr.po      |  757 ++++++++---------------
 po/sv.po      |  757 ++++++++---------------
 po/te.po      |  757 ++++++++---------------
 po/tr.po      |  757 ++++++++---------------
 po/ug.po      |  757 ++++++++---------------
 po/uk.po      |  757 ++++++++---------------
 po/zh_Hans.po |  757 ++++++++---------------
 28 files changed, 9389 insertions(+), 15198 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 06113dbc6e..be246b4f46 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index b38a3d4a87..af401afc4e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 96970c18fc..ced270acd4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2020-04-27 19:48+0000\n"
 "Last-Translator: Predatorix Phoenix <predatorix at web.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -369,6 +369,66 @@ msgstr "--refresh kann nur mit Containern verwendet werden"
 msgid "--target cannot be used with instances"
 msgstr "--refresh kann nur mit Containern verwendet werden"
 
+#: lxc/alias.go:192
+#, fuzzy
+msgid "<alias>"
+msgstr "Aliasse:\n"
+
+#: lxc/alias.go:52
+#, fuzzy
+msgid "<alias> <target>"
+msgstr "Ungültiges Ziel %s"
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+#, fuzzy
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/storage_volume.go:307
+#, fuzzy
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+#, fuzzy
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
@@ -3737,615 +3797,862 @@ msgstr "der Name des Ursprung Containers muss angegeben werden"
 msgid "You must specify a source instance name"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
-msgstr ""
-
-#: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
-msgstr ""
-
-#: lxc/config_device.go:78
+#: lxc/storage_volume.go:707
 #, fuzzy
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/profile.go:99
+#: lxc/storage_volume.go:221
 #, fuzzy
-msgid "add [<remote>:]<instance> <profile>"
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
 msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
+"Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+"lxd %s <Name>\n"
 
-#: lxc/config_device.go:83
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
 #, fuzzy
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+msgid "[<remote>:]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
-msgstr ""
-
-#: lxc/alias.go:20 lxc/image_alias.go:23
-#, fuzzy
-msgid "alias"
-msgstr "Aliasse:\n"
-
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
-msgstr ""
-
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:138
+#: lxc/import.go:26
 #, fuzzy
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+msgid "[<remote>:] <backup file>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
-msgstr ""
-
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/config_trust.go:55
+#, fuzzy
+msgid "[<remote>:] <cert>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/config_trust.go:190
+#, fuzzy
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/cluster.go:335
+#, fuzzy
+msgid "[<remote>:] <name>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/console.go:34
+#: lxc/image.go:972 lxc/list.go:42
 #, fuzzy
-msgid "console [<remote>:]<instance>"
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
-msgstr ""
-
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/image_alias.go:147
+#, fuzzy
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/query.go:30
+#, fuzzy
+msgid "[<remote>:]<API path>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/image_alias.go:102
+#, fuzzy
+msgid "[<remote>:]<alias>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
 #: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#, fuzzy
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_template.go:63
+#: lxc/image_alias.go:249
 #, fuzzy
-msgid "create [<remote>:]<instance> <template>"
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
-msgstr ""
-
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
-msgstr ""
-
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
-msgstr ""
-
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
-msgstr ""
-
-#: lxc/project.go:451
-msgid "current"
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "[<remote>:]<cluster member>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+#, fuzzy
+msgid "[<remote>:]<image>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/image.go:126
+#, fuzzy
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/image.go:274
+#: lxc/launch.go:23
 #, fuzzy
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/config_template.go:105
+#: lxc/image.go:451
 #, fuzzy
-msgid "delete [<remote>:]<instance> <template>"
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/file.go:102
+#: lxc/image.go:274 lxc/image.go:1271
 #, fuzzy
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/delete.go:27
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
 #, fuzzy
-msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+msgid "[<remote>:]<instance>"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:548
+#: lxc/config_device.go:188 lxc/config_device.go:698
 #, fuzzy
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:148
+#: lxc/config_device.go:519
 #, fuzzy
-msgid "delete [<remote>:]<project>"
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/storage.go:446
-msgid "description"
-msgstr ""
-
-#: lxc/network.go:377
+#: lxc/config_device.go:78
 #, fuzzy
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:625
+#: lxc/config_device.go:334
 #, fuzzy
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
-msgstr ""
-
-#: lxc/network.go:462
+#: lxc/config_device.go:423
 #, fuzzy
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/config_device.go:22
-msgid "device"
-msgstr ""
-
-#: lxc/image.go:889
-msgid "disabled"
-msgstr ""
-
-#: lxc/storage.go:445
-msgid "driver"
-msgstr ""
-
-#: lxc/cluster.go:420
+#: lxc/profile.go:99 lxc/profile.go:634
 #, fuzzy
-msgid "edit [<remote>:]<cluster member>"
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_metadata.go:50
+#: lxc/profile.go:161
 #, fuzzy
-msgid "edit [<remote>:]<instance>"
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_template.go:148
+#: lxc/restore.go:22
 #, fuzzy
-msgid "edit [<remote>:]<instance> <template>"
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/file.go:152
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
 #, fuzzy
-msgid "edit [<remote>:]<instance>/<path>"
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
-msgstr ""
-
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:788
+#: lxc/snapshot.go:25
 #, fuzzy
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+#, fuzzy
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/config.go:87
+#: lxc/exec.go:38
 #, fuzzy
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
-msgstr ""
-
-#: lxc/image.go:891
-msgid "enabled"
-msgstr ""
-
-#: lxc/action.go:295
-#, fuzzy, c-format
-msgid "error: %v"
-msgstr "Fehler: %v\n"
-
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
-msgstr ""
-
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
-msgstr ""
-
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
-msgstr ""
-
 #: lxc/export.go:30
 #, fuzzy
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/file.go:152
+#, fuzzy
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_device.go:188
+#: lxc/file.go:102
 #, fuzzy
-msgid "get [<remote>:]<instance> <device> <key>"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/file.go:215
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/storage_volume.go:988
+#: lxc/rename.go:19
 #, fuzzy
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_device.go:190
+#: lxc/publish.go:29
 #, fuzzy
-msgid "get [<remote>:]<profile> <device> <key>"
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
+"Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
-"lxd %s <Name>\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+
+#: lxc/move.go:33
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
+msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+
+#: lxc/delete.go:27
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
+msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+#, fuzzy
+msgid "[<remote>:]<member>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/project.go:332
+#: lxc/cluster.go:201
 #, fuzzy
-msgid "get [<remote>:]<project> <key>"
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/config.go:358
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
 #, fuzzy
-msgid "get [<remote>:][<instance>] <key>"
+msgid "[<remote>:]<network>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/network.go:377
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/network.go:107
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/network.go:670 lxc/network.go:1154
+#, fuzzy
+msgid "[<remote>:]<network> <key>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/network.go:1022
+#, fuzzy
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/network.go:971
+#, fuzzy
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/network.go:462
+#, fuzzy
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/network.go:180
+#, fuzzy
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/network.go:253
+#, fuzzy
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/info.go:31
+#: lxc/operation.go:50 lxc/operation.go:179
 #, fuzzy
-msgid "info [<remote>:][<instance>]"
+msgid "[<remote>:]<operation>"
 msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
+"Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+"lxd %s <Name>\n"
 
-#: lxc/init.go:38
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
 #, fuzzy
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[<remote>:]<pool>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/storage.go:87
+#, fuzzy
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/storage.go:331 lxc/storage.go:733
+#, fuzzy
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:580
+#, fuzzy
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/storage_volume.go:1190
+#, fuzzy
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage_volume.go:625
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
+#: lxc/storage_volume.go:138
 #, fuzzy
-msgid "list [<remote>:]<instance>"
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/storage_volume.go:1478
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/config_device.go:270
+#: lxc/storage_volume.go:1303
 #, fuzzy
-msgid "list [<remote>:]<profile>"
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage_volume.go:1587
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/alias.go:56
-msgid ""
-"lxc alias add list \"list -c ns46S\"\n"
-"    Overwrite the \"list\" command to pass -c ns46S."
+#: lxc/storage_volume.go:1511
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/alias.go:197
-msgid ""
-"lxc alias remove my-list\n"
-"    Remove the \"my-list\" alias."
+#: lxc/storage_volume.go:470
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/alias.go:146
-msgid ""
-"lxc alias rename list my-list\n"
-"    Rename existing alias \"list\" to \"my-list\"."
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:424
-msgid ""
-"lxc cluster edit <cluster member> < member.yaml\n"
-"    Update a cluster member using the content of member.yaml"
+#: lxc/storage_volume.go:988
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_device.go:79
-msgid ""
-"lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
-"c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the instance."
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+#, fuzzy
+msgid "[<remote>:]<profile>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/config.go:91
-msgid ""
-"lxc config edit <instance> < instance.yaml\n"
-"    Update the instance configuration from config.yaml."
+#: lxc/config_device.go:190 lxc/config_device.go:700
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
-
-#: lxc/config.go:457
-msgid ""
-"lxc config set [<remote>:]<instance> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the instance.\n"
-"\n"
-"lxc config set core.https_address=[::]:8443\n"
-"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
-"lxc config set core.trust_password=blah\n"
-"    Will set the server's trust password to blah."
-msgstr ""
+"lxd %s <Name>\n"
 
-#: lxc/export.go:34
-msgid ""
-"lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 instance."
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/file.go:219
-msgid ""
-"lxc file pull foo/etc/hosts .\n"
-"   To pull /etc/hosts from the instance and write it to the current "
-"directory."
+#: lxc/config_device.go:83
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
-#: lxc/file.go:409
-msgid ""
-"lxc file push /etc/hosts foo/etc/hosts\n"
-"   To push /etc/hosts into the instance \"foo\"."
+#: lxc/profile.go:526 lxc/profile.go:873
+#, fuzzy
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
-
-#: lxc/image.go:330
-msgid ""
-"lxc image edit <image>\n"
-"    Launch a text editor to edit the properties\n"
+"Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
-"lxc image edit <image> < image.yaml\n"
-"    Load the image properties from a YAML file"
-msgstr ""
+"lxd %s <Name>\n"
 
-#: lxc/import.go:30
-msgid ""
-"lxc import backup0.tar.gz\n"
-"    Create a new instance using backup0.tar.gz as the source."
+#: lxc/profile.go:760
+#, fuzzy
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
-
-#: lxc/info.go:35
-msgid ""
-"lxc info [<remote>:]<instance> [--show-log]\n"
-"    For instance information.\n"
+"Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
-"lxc info [<remote>:] [--resources]\n"
-"    For LXD server information."
+"lxd %s <Name>\n"
+
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "[<remote>:]<profile> <name>..."
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/profile.go:709
+#, fuzzy
+msgid "[<remote>:]<profile> <new-name>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/profile.go:241
+#, fuzzy
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+#, fuzzy
+msgid "[<remote>:]<project>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/project.go:332 lxc/project.go:595
+#, fuzzy
+msgid "[<remote>:]<project> <key>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/project.go:535
+#, fuzzy
+msgid "[<remote>:]<project> <key>=<value>..."
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/project.go:479
+#, fuzzy
+msgid "[<remote>:]<project> <new-name>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/copy.go:37
+#, fuzzy
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+
+#: lxc/config.go:87 lxc/config.go:608
+#, fuzzy
+msgid "[<remote>:][<instance>[/<snapshot>]]"
+msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+
+#: lxc/info.go:31
+#, fuzzy
+msgid "[<remote>:][<instance>]"
+msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+
+#: lxc/config.go:358 lxc/config.go:732
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/config.go:450
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>=<value>..."
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
+msgstr ""
+
+#: lxc/init.go:38
+#, fuzzy
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/project.go:451
+msgid "current"
+msgstr ""
+
+#: lxc/remote.go:510
+msgid "default"
+msgstr ""
+
+#: lxc/storage.go:446
+msgid "description"
+msgstr ""
+
+#: lxc/image.go:889
+msgid "disabled"
+msgstr ""
+
+#: lxc/storage.go:445
+msgid "driver"
+msgstr ""
+
+#: lxc/image.go:891
+msgid "enabled"
+msgstr ""
+
+#: lxc/action.go:295
+#, fuzzy, c-format
+msgid "error: %v"
+msgstr "Fehler: %v\n"
+
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
+msgstr ""
+
+#: lxc/storage.go:443
+msgid "info"
+msgstr ""
+
+#: lxc/alias.go:56
+msgid ""
+"lxc alias add list \"list -c ns46S\"\n"
+"    Overwrite the \"list\" command to pass -c ns46S."
+msgstr ""
+
+#: lxc/alias.go:197
+msgid ""
+"lxc alias remove my-list\n"
+"    Remove the \"my-list\" alias."
+msgstr ""
+
+#: lxc/alias.go:146
+msgid ""
+"lxc alias rename list my-list\n"
+"    Rename existing alias \"list\" to \"my-list\"."
+msgstr ""
+
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
+#: lxc/config_device.go:79
+msgid ""
+"lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the instance."
+msgstr ""
+
+#: lxc/config.go:91
+msgid ""
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
+msgstr ""
+
+#: lxc/config.go:457
+msgid ""
+"lxc config set [<remote>:]<instance> limits.cpu=2\n"
+"    Will set a CPU limit of \"2\" for the instance.\n"
+"\n"
+"lxc config set core.https_address=[::]:8443\n"
+"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"\n"
+"lxc config set core.trust_password=blah\n"
+"    Will set the server's trust password to blah."
+msgstr ""
+
+#: lxc/export.go:34
+msgid ""
+"lxc export u1 backup0.tar.gz\n"
+"    Download a backup tarball of the u1 instance."
+msgstr ""
+
+#: lxc/file.go:219
+msgid ""
+"lxc file pull foo/etc/hosts .\n"
+"   To pull /etc/hosts from the instance and write it to the current "
+"directory."
+msgstr ""
+
+#: lxc/file.go:409
+msgid ""
+"lxc file push /etc/hosts foo/etc/hosts\n"
+"   To push /etc/hosts into the instance \"foo\"."
+msgstr ""
+
+#: lxc/image.go:330
+msgid ""
+"lxc image edit <image>\n"
+"    Launch a text editor to edit the properties\n"
+"\n"
+"lxc image edit <image> < image.yaml\n"
+"    Load the image properties from a YAML file"
+msgstr ""
+
+#: lxc/import.go:30
+msgid ""
+"lxc import backup0.tar.gz\n"
+"    Create a new instance using backup0.tar.gz as the source."
+msgstr ""
+
+#: lxc/info.go:35
+msgid ""
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
+"\n"
+"lxc info [<remote>:] [--resources]\n"
+"    For LXD server information."
 msgstr ""
 
 #: lxc/init.go:41
@@ -4489,44 +4796,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-#, fuzzy
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/move.go:33
-#, fuzzy
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4536,493 +4809,205 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr "OK (y/n)? "
 
-#: lxc/operation.go:22
-#, fuzzy
-msgid "operation"
-msgstr "Eigenschaften:\n"
-
-#: lxc/config_device.go:334
-#, fuzzy
-msgid "override [<remote>:]<instance> <device> [key=value...]"
+#: lxc/config.go:53
+msgid "please use `lxc profile`"
 msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
 
-#: lxc/action.go:48
-#, fuzzy
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/config.go:53
-msgid "please use `lxc profile`"
-msgstr ""
-
-#: lxc/profile.go:27
-#, fuzzy
-msgid "profile"
-msgstr "Profil %s erstellt\n"
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-#, fuzzy
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
-#: lxc/file.go:215
-#, fuzzy
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
-#: lxc/file.go:405
-#, fuzzy
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-#, fuzzy
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-#, fuzzy
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/profile.go:634
-#, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
+#: lxc/storage.go:448
+msgid "space used"
 msgstr ""
 
-#: lxc/config_device.go:425
-#, fuzzy
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
+#: lxc/info.go:582
+msgid "stateful"
 msgstr ""
 
-#: lxc/rename.go:19
-#, fuzzy
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
+#: lxc/info.go:584
+msgid "stateless"
 msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
+#: lxc/info.go:574
+#, c-format
+msgid "taken at %s"
 msgstr ""
 
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
+#: lxc/storage.go:447
+msgid "total space"
 msgstr ""
 
-#: lxc/storage_volume.go:1190
-#, fuzzy
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
+#: lxc/version.go:48
+msgid "unreachable"
 msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
+#: lxc/storage.go:442
+msgid "used by"
 msgstr ""
 
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
+#: lxc/remote.go:270
+msgid "y"
 msgstr ""
 
-#: lxc/action.go:68
-#, fuzzy
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
+#: lxc/image.go:1069
+msgid "yes"
 msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
 
-#: lxc/restore.go:22
 #, fuzzy
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+#~ msgid "console [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:1587
 #, fuzzy
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+#~ msgid "create [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/config_device.go:519
 #, fuzzy
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
+#~ msgid "delete [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/network.go:1022
 #, fuzzy
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
+#~ msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:1303
 #, fuzzy
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
+#~ msgid "list [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/config_device.go:526
 #, fuzzy
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
+#~ msgid "operation"
+#~ msgstr "Eigenschaften:\n"
 
-#: lxc/profile.go:760
 #, fuzzy
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
+#~ msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/project.go:535
 #, fuzzy
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
+#~ msgid "profile"
+#~ msgstr "Profil %s erstellt\n"
 
-#: lxc/config.go:450
 #, fuzzy
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
+#~ msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
 #, fuzzy
-msgid "show [<remote>:]<instance>"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+#~ msgid "remove [<remote>:]<instance> <profile>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/config_template.go:293
 #, fuzzy
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
+#~ msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:1379
 #, fuzzy
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
+#~ msgid "show [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Löscht einen Container oder Container Sicherungspunkt.\n"
+#~ "\n"
+#~ "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+#~ "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config.go:608
 #, fuzzy
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+#~ msgid "show [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Löscht einen Container oder Container Sicherungspunkt.\n"
+#~ "\n"
+#~ "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+#~ "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/snapshot.go:25
 #, fuzzy
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+#~ msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgstr ""
+#~ "Löscht einen Container oder Container Sicherungspunkt.\n"
+#~ "\n"
+#~ "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+#~ "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/storage_volume.go:1511
 #, fuzzy
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
-#: lxc/storage.go:448
-msgid "space used"
-msgstr ""
+#~ msgid "show [<remote>:][<instance>[/<snapshot>]]"
+#~ msgstr ""
+#~ "Löscht einen Container oder Container Sicherungspunkt.\n"
+#~ "\n"
+#~ "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+#~ "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/action.go:29
 #, fuzzy
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/info.go:582
-msgid "stateful"
-msgstr ""
-
-#: lxc/info.go:584
-msgid "stateless"
-msgstr ""
+#~ msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
+#~ msgstr ""
+#~ "Löscht einen Container oder Container Sicherungspunkt.\n"
+#~ "\n"
+#~ "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+#~ "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/action.go:89
 #, fuzzy
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
+#~ msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/project.go:677
 #, fuzzy
-msgid "switch [<remote>:]<project>"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/info.go:574
-#, c-format
-msgid "taken at %s"
-msgstr ""
-
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
-#: lxc/storage.go:447
-msgid "total space"
-msgstr ""
-
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
-#: lxc/version.go:48
-msgid "unreachable"
-msgstr ""
+#~ msgid "switch [<remote>:]<project>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/config_device.go:698
 #, fuzzy
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
+#~ msgid "unset [<remote>:]<instance> <device> <key>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/config_device.go:700
 #, fuzzy
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
+#~ msgid "unset [<remote>:]<profile> <device> <key>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/project.go:595
 #, fuzzy
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
+#~ msgid "unset [<remote>:]<project> <key>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
-#: lxc/config.go:732
 #, fuzzy
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/storage.go:442
-msgid "used by"
-msgstr ""
-
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
-#: lxc/remote.go:270
-msgid "y"
-msgstr ""
-
-#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
-#: lxc/image.go:1069
-msgid "yes"
-msgstr ""
+#~ msgid "unset [<remote>:][<instance>] <key>"
+#~ msgstr ""
+#~ "Ändert den Laufzustand eines Containers in %s.\n"
+#~ "\n"
+#~ "lxd %s <Name>\n"
 
 #, fuzzy
 #~ msgid "Add devices to instances or profiles"
 #~ msgstr "Geräte zu Containern oder Profilen hinzufügen"
 
-#, fuzzy
-#~ msgid "show [<remote>:]<instance|profile>"
-#~ msgstr ""
-#~ "Löscht einen Container oder Container Sicherungspunkt.\n"
-#~ "\n"
-#~ "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-#~ "Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
 #, fuzzy
 #~ msgid "Show storage volum configurations"
 #~ msgstr "Profil %s erstellt\n"
diff --git a/po/el.po b/po/el.po
index 3e6624b94b..b652917816 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -242,6 +242,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3403,388 +3449,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4016,35 +4073,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4053,233 +4085,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4288,87 +4101,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 18571f44bb..0aa5d08473 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -365,6 +365,54 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+#, fuzzy
+msgid "<alias>"
+msgstr "Aliases:"
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+#, fuzzy
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr "No se puede proveer el nombre del container a la lista"
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
@@ -3551,407 +3599,483 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
-msgstr ""
-
-#: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
-msgstr ""
+#: lxc/storage_volume.go:707
+#, fuzzy
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:78
+#: lxc/storage_volume.go:221
 #, fuzzy
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/profile.go:99
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
 #, fuzzy
-msgid "add [<remote>:]<instance> <profile>"
+msgid "[<remote>:]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:83
+#: lxc/import.go:26
 #, fuzzy
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+msgid "[<remote>:] <backup file>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
-msgstr ""
+#: lxc/config_trust.go:55
+#, fuzzy
+msgid "[<remote>:] <cert>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
+#: lxc/config_trust.go:190
 #, fuzzy
-msgid "alias"
-msgstr "Aliases:"
+msgid "[<remote>:] <hostname|fingerprint>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
-msgstr ""
+#: lxc/cluster.go:335
+#, fuzzy
+msgid "[<remote>:] <name>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
-msgstr ""
+#: lxc/image.go:972 lxc/list.go:42
+#, fuzzy
+msgid "[<remote>:] [<filter>...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
-msgstr ""
+#: lxc/image_alias.go:147
+#, fuzzy
+msgid "[<remote>:] [<filters>...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
-msgstr ""
+#: lxc/query.go:30
+#, fuzzy
+msgid "[<remote>:]<API path>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
-msgstr ""
+#: lxc/image_alias.go:102
+#, fuzzy
+msgid "[<remote>:]<alias>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:29
-msgid "cluster"
-msgstr ""
+#: lxc/image_alias.go:56
+#, fuzzy
+msgid "[<remote>:]<alias> <fingerprint>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config.go:28
-msgid "config"
-msgstr ""
+#: lxc/image_alias.go:249
+#, fuzzy
+msgid "[<remote>:]<alias> <new-name>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
-msgstr ""
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "[<remote>:]<cluster member>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
-msgstr ""
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+#, fuzzy
+msgid "[<remote>:]<image>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
-msgstr ""
-
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
-msgstr ""
+#, fuzzy
+msgid "[<remote>:]<image> <remote>:"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
-msgstr ""
+#: lxc/launch.go:23
+#, fuzzy
+msgid "[<remote>:]<image> [<remote>:][<name>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
-msgstr ""
+#: lxc/image.go:451
+#, fuzzy
+msgid "[<remote>:]<image> [<target>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_template.go:63
+#: lxc/image.go:274 lxc/image.go:1271
 #, fuzzy
-msgid "create [<remote>:]<instance> <template>"
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
-msgstr ""
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+#, fuzzy
+msgid "[<remote>:]<instance>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
-msgstr ""
+#: lxc/config_device.go:188 lxc/config_device.go:698
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
-msgstr ""
+#: lxc/config_device.go:519
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
-msgstr ""
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
-msgstr ""
+#: lxc/config_device.go:334
+#, fuzzy
+msgid "[<remote>:]<instance> <device> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/project.go:451
-msgid "current"
-msgstr ""
+#: lxc/config_device.go:423
+#, fuzzy
+msgid "[<remote>:]<instance> <name>..."
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/remote.go:510
-msgid "default"
-msgstr ""
+#: lxc/profile.go:99 lxc/profile.go:634
+#, fuzzy
+msgid "[<remote>:]<instance> <profile>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
-msgstr ""
+#: lxc/profile.go:161
+#, fuzzy
+msgid "[<remote>:]<instance> <profiles>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
+#: lxc/restore.go:22
+#, fuzzy
+msgid "[<remote>:]<instance> <snapshot>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_template.go:105
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
 #, fuzzy
-msgid "delete [<remote>:]<instance> <template>"
+msgid "[<remote>:]<instance> <template>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
-msgstr ""
+#: lxc/snapshot.go:25
+#, fuzzy
+msgid "[<remote>:]<instance> [<snapshot name>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/delete.go:27
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
 #, fuzzy
-msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
-msgstr ""
+#: lxc/exec.go:38
+#, fuzzy
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
-msgstr ""
+#: lxc/file.go:152
+#, fuzzy
+msgid "[<remote>:]<instance>/<path>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
+#: lxc/file.go:102
+#, fuzzy
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
-msgstr ""
+#: lxc/file.go:215
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
-msgstr ""
+#: lxc/rename.go:19
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage.go:446
-msgid "description"
-msgstr ""
+#: lxc/publish.go:29
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
-msgstr ""
+#: lxc/move.go:33
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
+#: lxc/delete.go:27
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
-msgstr ""
+#: lxc/cluster.go:152 lxc/cluster.go:251
+#, fuzzy
+msgid "[<remote>:]<member>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:462
+#: lxc/cluster.go:201
 #, fuzzy
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+msgid "[<remote>:]<member> <new-name>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:22
-msgid "device"
-msgstr ""
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+#, fuzzy
+msgid "[<remote>:]<network>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:889
-msgid "disabled"
-msgstr ""
+#: lxc/network.go:377
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage.go:445
-msgid "driver"
-msgstr ""
+#: lxc/network.go:107
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:420
+#: lxc/network.go:670 lxc/network.go:1154
 #, fuzzy
-msgid "edit [<remote>:]<cluster member>"
+msgid "[<remote>:]<network> <key>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
-msgstr ""
+#: lxc/network.go:1022
+#, fuzzy
+msgid "[<remote>:]<network> <key>=<value>..."
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_metadata.go:50
+#: lxc/network.go:971
 #, fuzzy
-msgid "edit [<remote>:]<instance>"
+msgid "[<remote>:]<network> <new-name>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_template.go:148
+#: lxc/network.go:462
 #, fuzzy
-msgid "edit [<remote>:]<instance> <template>"
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/file.go:152
+#: lxc/network.go:180
 #, fuzzy
-msgid "edit [<remote>:]<instance>/<path>"
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
-msgstr ""
+#: lxc/network.go:253
+#, fuzzy
+msgid "[<remote>:]<network> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
-msgstr ""
+#: lxc/operation.go:50 lxc/operation.go:179
+#, fuzzy
+msgid "[<remote>:]<operation>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+#, fuzzy
+msgid "[<remote>:]<pool>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
-msgstr ""
+#: lxc/storage.go:87
+#, fuzzy
+msgid "[<remote>:]<pool> <driver> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
-msgstr ""
+#: lxc/storage.go:331 lxc/storage.go:733
+#, fuzzy
+msgid "[<remote>:]<pool> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config.go:87
+#: lxc/storage.go:580
 #, fuzzy
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
-msgstr ""
+#: lxc/storage_volume.go:1190
+#, fuzzy
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:891
-msgid "enabled"
-msgstr ""
+#: lxc/storage_volume.go:625
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
-msgstr ""
+#: lxc/storage_volume.go:138
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
-msgstr ""
+#: lxc/storage_volume.go:1478
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/info.go:578
-#, fuzzy, c-format
-msgid "expires at %s"
-msgstr "Expira: %s"
+#: lxc/storage_volume.go:1303
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
-msgstr ""
+#: lxc/storage_volume.go:1587
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <snapshot>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
-msgstr ""
+#: lxc/storage_volume.go:1511
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/file.go:70
-msgid "file"
-msgstr ""
+#: lxc/storage_volume.go:470
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:188
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
 #, fuzzy
-msgid "get [<remote>:]<instance> <device> <key>"
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
-msgstr ""
+#: lxc/storage_volume.go:988
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
-msgstr ""
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+#, fuzzy
+msgid "[<remote>:]<profile>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
-msgstr ""
+#: lxc/config_device.go:190 lxc/config_device.go:700
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:190
+#: lxc/config_device.go:526
 #, fuzzy
-msgid "get [<remote>:]<profile> <device> <key>"
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
-msgstr ""
+#: lxc/config_device.go:83
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
-msgstr ""
+#: lxc/profile.go:526 lxc/profile.go:873
+#, fuzzy
+msgid "[<remote>:]<profile> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config.go:358
+#: lxc/profile.go:760
 #, fuzzy
-msgid "get [<remote>:][<instance>] <key>"
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/remote.go:421
-msgid "get-default"
-msgstr ""
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "[<remote>:]<profile> <name>..."
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:36
-msgid "image"
-msgstr ""
+#: lxc/profile.go:709
+#, fuzzy
+msgid "[<remote>:]<profile> <new-name>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
-msgstr ""
+#: lxc/profile.go:241
+#, fuzzy
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
-msgstr ""
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+#, fuzzy
+msgid "[<remote>:]<project>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage.go:443
-msgid "info"
-msgstr ""
+#: lxc/project.go:332 lxc/project.go:595
+#, fuzzy
+msgid "[<remote>:]<project> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
-msgstr ""
+#: lxc/project.go:535
+#, fuzzy
+msgid "[<remote>:]<project> <key>=<value>..."
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
-msgstr ""
+#: lxc/project.go:479
+#, fuzzy
+msgid "[<remote>:]<project> <new-name>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
-msgstr ""
+#: lxc/copy.go:37
+#, fuzzy
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+msgstr "No se puede proveer el nombre del container a la lista"
+
+#: lxc/config.go:87 lxc/config.go:608
+#, fuzzy
+msgid "[<remote>:][<instance>[/<snapshot>]]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/info.go:31
 #, fuzzy
-msgid "info [<remote>:][<instance>]"
+msgid "[<remote>:][<instance>]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+#: lxc/config.go:358 lxc/config.go:732
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
+
+#: lxc/config.go:450
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>=<value>..."
+msgstr "No se puede proveer el nombre del container a la lista"
+
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:38
+#, fuzzy
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgstr "No se puede proveer el nombre del container a la lista"
+
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-#, fuzzy
-msgid "list [<remote>:]<instance>"
-msgstr "No se puede proveer el nombre del container a la lista"
+#: lxc/image.go:891
+msgid "enabled"
+msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-#, fuzzy
-msgid "list [<remote>:]<profile>"
-msgstr "No se puede proveer el nombre del container a la lista"
+#: lxc/info.go:578
+#, fuzzy, c-format
+msgid "expires at %s"
+msgstr "Expira: %s"
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4183,36 +4307,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-#, fuzzy
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4221,249 +4319,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-#, fuzzy
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/action.go:48
-#, fuzzy
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-#, fuzzy
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/profile.go:634
-#, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-#, fuzzy
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-#, fuzzy
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-#, fuzzy
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/restore.go:22
-#, fuzzy
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-#, fuzzy
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-#, fuzzy
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-#, fuzzy
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-#, fuzzy
-msgid "show [<remote>:]<instance>"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/config_template.go:293
-#, fuzzy
-msgid "show [<remote>:]<instance> <template>"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-#, fuzzy
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/snapshot.go:25
-#, fuzzy
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-#, fuzzy
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4472,106 +4335,88 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-#, fuzzy
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-#, fuzzy
-msgid "switch [<remote>:]<project>"
-msgstr "No se puede proveer el nombre del container a la lista"
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-#, fuzzy
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr "No se puede proveer el nombre del container a la lista"
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
+#: lxc/storage.go:442
+msgid "used by"
 msgstr ""
 
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
+#: lxc/remote.go:270
+msgid "y"
 msgstr ""
 
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
+#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
+#: lxc/image.go:1069
+msgid "yes"
 msgstr ""
 
-#: lxc/config_device.go:700
 #, fuzzy
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr "No se puede proveer el nombre del container a la lista"
+#~ msgid "create [<remote>:]<instance> <template>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
+#, fuzzy
+#~ msgid "delete [<remote>:]<instance> <template>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
+#, fuzzy
+#~ msgid "list [<remote>:]<instance>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config.go:732
 #, fuzzy
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr "No se puede proveer el nombre del container a la lista"
+#~ msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage.go:442
-msgid "used by"
-msgstr ""
+#, fuzzy
+#~ msgid "remove [<remote>:]<instance> <profile>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
+#, fuzzy
+#~ msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/storage_volume.go:31
 #, fuzzy
-msgid "volume"
-msgstr "Columnas"
+#~ msgid "show [<remote>:]<instance>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/remote.go:270
-msgid "y"
-msgstr ""
+#, fuzzy
+#~ msgid "show [<remote>:]<instance> <template>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
-#: lxc/image.go:1069
-msgid "yes"
-msgstr ""
+#, fuzzy
+#~ msgid "show [<remote>:][<instance>[/<snapshot>]]"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
+
+#, fuzzy
+#~ msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
+
+#, fuzzy
+#~ msgid "unset [<remote>:]<instance> <device> <key>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
+
+#, fuzzy
+#~ msgid "unset [<remote>:]<profile> <device> <key>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
 
 #, fuzzy
-#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgid "unset [<remote>:][<instance>] <key>"
 #~ msgstr "No se puede proveer el nombre del container a la lista"
 
+#, fuzzy
+#~ msgid "volume"
+#~ msgstr "Columnas"
+
 #~ msgid "Commands:"
 #~ msgstr "Comandos:"
 
diff --git a/po/fa.po b/po/fa.po
index 1f107b07e8..c256dcd4ab 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index c48b74b0cd..f1fb6adf9e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index ea3f85da02..3d443affe6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2019-01-04 18:07+0000\n"
 "Last-Translator: Deleted User <noreply+12102 at weblate.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -364,6 +364,68 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+#, fuzzy
+msgid "<alias>"
+msgstr "Alias :"
+
+#: lxc/alias.go:52
+#, fuzzy
+msgid "<alias> <target>"
+msgstr "Cible invalide %s"
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+#, fuzzy
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/storage_volume.go:307
+#, fuzzy
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/remote.go:598 lxc/remote.go:649
+#, fuzzy
+msgid "<remote>"
+msgstr "Serveur distant : %s"
+
+#: lxc/remote.go:687
+#, fuzzy
+msgid "<remote> <URL>"
+msgstr "Serveur distant : %s"
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+#, fuzzy
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
@@ -3826,25 +3888,40 @@ msgstr "vous devez spécifier un nom de conteneur source"
 msgid "You must specify a source instance name"
 msgstr "vous devez spécifier un nom de conteneur source"
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+#, fuzzy
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+#: lxc/storage_volume.go:221
+#, fuzzy
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:78
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+#, fuzzy
+msgid "[<remote>:]"
+msgstr "Serveur distant : %s"
+
+#: lxc/import.go:26
 #, fuzzy
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgid "[<remote>:] <backup file>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:99
+#: lxc/config_trust.go:55
 #, fuzzy
-msgid "add [<remote>:]<instance> <profile>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -3854,158 +3931,154 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/config_device.go:83
+#: lxc/config_trust.go:190
 #, fuzzy
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"Supprimer des conteneurs ou des instantanés.\n"
 "\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
-msgstr ""
-
-#: lxc/alias.go:20 lxc/image_alias.go:23
-#, fuzzy
-msgid "alias"
-msgstr "Alias :"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/profile.go:161
+#: lxc/cluster.go:335
 #, fuzzy
-msgid "assign [<remote>:]<instance> <profiles>"
-msgstr "impossible de supprimer le serveur distant par défaut"
-
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+msgid "[<remote>:] <name>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/storage_volume.go:138
+#: lxc/image.go:972 lxc/list.go:42
 #, fuzzy
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
-msgstr ""
-
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
-msgstr ""
-
-#: lxc/cluster.go:29
-msgid "cluster"
-msgstr ""
-
-#: lxc/config.go:28
-msgid "config"
-msgstr ""
-
-#: lxc/console.go:34
+#: lxc/image_alias.go:147
 #, fuzzy
-msgid "console [<remote>:]<instance>"
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"Supprimer des conteneurs ou des instantanés.\n"
 "\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
-msgstr ""
-
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
-msgstr ""
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/query.go:30
+#, fuzzy
+msgid "[<remote>:]<API path>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/image_alias.go:102
+#, fuzzy
+msgid "[<remote>:]<alias>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
 #: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#, fuzzy
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/config_template.go:63
+#: lxc/image_alias.go:249
 #, fuzzy
-msgid "create [<remote>:]<instance> <template>"
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
-msgstr ""
-
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
-msgstr ""
-
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
-msgstr ""
-
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "[<remote>:]<cluster member>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+#, fuzzy
+msgid "[<remote>:]<image>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/project.go:451
+#: lxc/image.go:126
 #, fuzzy
-msgid "current"
-msgstr "Swap (courant)"
-
-#: lxc/remote.go:510
-msgid "default"
-msgstr "par défaut"
-
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:274
+#: lxc/launch.go:23
 #, fuzzy
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_template.go:105
+#: lxc/image.go:451
 #, fuzzy
-msgid "delete [<remote>:]<instance> <template>"
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:102
+#: lxc/image.go:274 lxc/image.go:1271
 #, fuzzy
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/delete.go:27
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
 #, fuzzy
-msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+msgid "[<remote>:]<instance>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4015,85 +4088,49 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:548
+#: lxc/config_device.go:188 lxc/config_device.go:698
 #, fuzzy
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:148
+#: lxc/config_device.go:519
 #, fuzzy
-msgid "delete [<remote>:]<project>"
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage.go:446
-msgid "description"
-msgstr ""
-
-#: lxc/network.go:377
+#: lxc/config_device.go:78
 #, fuzzy
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:625
+#: lxc/config_device.go:334
 #, fuzzy
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
-msgstr ""
-
-#: lxc/network.go:462
+#: lxc/config_device.go:423
 #, fuzzy
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:22
-msgid "device"
-msgstr ""
-
-#: lxc/image.go:889
-msgid "disabled"
-msgstr "désactivé"
-
-#: lxc/storage.go:445
-msgid "driver"
-msgstr ""
-
-#: lxc/cluster.go:420
+#: lxc/profile.go:99 lxc/profile.go:634
 #, fuzzy
-msgid "edit [<remote>:]<cluster member>"
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4103,13 +4140,9 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_metadata.go:50
+#: lxc/profile.go:161
 #, fuzzy
-msgid "edit [<remote>:]<instance>"
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4119,9 +4152,9 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/config_template.go:148
+#: lxc/restore.go:22
 #, fuzzy
-msgid "edit [<remote>:]<instance> <template>"
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4131,9 +4164,10 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/file.go:152
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
 #, fuzzy
-msgid "edit [<remote>:]<instance>/<path>"
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4143,17 +4177,9 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
-msgstr ""
-
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:788
+#: lxc/snapshot.go:25
 #, fuzzy
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4163,17 +4189,17 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+#, fuzzy
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:87
+#: lxc/exec.go:38
 #, fuzzy
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4183,64 +4209,96 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/export.go:30
+#, fuzzy
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:891
-msgid "enabled"
-msgstr "activé"
-
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
-msgstr "erreur : %v"
-
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/file.go:152
+#, fuzzy
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/info.go:578
-#, fuzzy, c-format
-msgid "expires at %s"
-msgstr "Expire : %s"
-
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/file.go:102
+#, fuzzy
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/export.go:30
+#: lxc/file.go:215
 #, fuzzy
 msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"Supprimer des conteneurs ou des instantanés.\n"
 "\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/rename.go:19
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/config_device.go:188
+#: lxc/publish.go:29
 #, fuzzy
-msgid "get [<remote>:]<instance> <device> <key>"
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"Publier des conteneurs en tant qu'images.\n"
 "\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]"
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/move.go:33
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/delete.go:27
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/storage_volume.go:988
+#: lxc/cluster.go:152 lxc/cluster.go:251
 #, fuzzy
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+msgid "[<remote>:]<member>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4250,72 +4308,133 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/config_device.go:190
+#: lxc/cluster.go:201
 #, fuzzy
-msgid "get [<remote>:]<profile> <device> <key>"
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+#, fuzzy
+msgid "[<remote>:]<network>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/project.go:332
+#: lxc/network.go:377
 #, fuzzy
-msgid "get [<remote>:]<project> <key>"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:358
+#: lxc/network.go:107
 #, fuzzy
-msgid "get [<remote>:][<instance>] <key>"
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:421
+#: lxc/network.go:670 lxc/network.go:1154
 #, fuzzy
-msgid "get-default"
-msgstr "par défaut"
+msgid "[<remote>:]<network> <key>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/network.go:1022
+#, fuzzy
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/network.go:971
+#, fuzzy
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/network.go:462
+#, fuzzy
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/network.go:180
+#, fuzzy
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/network.go:253
+#, fuzzy
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/operation.go:50 lxc/operation.go:179
+#, fuzzy
+msgid "[<remote>:]<operation>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+#, fuzzy
+msgid "[<remote>:]<pool>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/info.go:31
+#: lxc/storage.go:87
+#, fuzzy
+msgid "[<remote>:]<pool> <driver> [key=value...]"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/storage.go:331 lxc/storage.go:733
+#, fuzzy
+msgid "[<remote>:]<pool> <key>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/storage.go:580
+#, fuzzy
+msgid "[<remote>:]<pool> <key> <value>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/storage_volume.go:1190
 #, fuzzy
-msgid "info [<remote>:][<instance>]"
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4325,89 +4444,334 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/init.go:38
+#: lxc/storage_volume.go:625
 #, fuzzy
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/storage_volume.go:138
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/storage_volume.go:1478
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage_volume.go:1303
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/storage_volume.go:1587
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage_volume.go:1511
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
+#: lxc/storage_volume.go:470
 #, fuzzy
-msgid "list [<remote>:]<instance>"
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
+msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
+
+#: lxc/storage_volume.go:988
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
 
-#: lxc/config_device.go:270
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
 #, fuzzy
-msgid "list [<remote>:]<profile>"
+msgid "[<remote>:]<profile>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/alias.go:56
-msgid ""
-"lxc alias add list \"list -c ns46S\"\n"
-"    Overwrite the \"list\" command to pass -c ns46S."
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/alias.go:197
-msgid ""
-"lxc alias remove my-list\n"
-"    Remove the \"my-list\" alias."
+#: lxc/config_device.go:83
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/alias.go:146
-msgid ""
-"lxc alias rename list my-list\n"
-"    Rename existing alias \"list\" to \"my-list\"."
+#: lxc/profile.go:526 lxc/profile.go:873
+#, fuzzy
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:424
-msgid ""
-"lxc cluster edit <cluster member> < member.yaml\n"
-"    Update a cluster member using the content of member.yaml"
+#: lxc/profile.go:760
+#, fuzzy
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:79
-msgid ""
-"lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
-"c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the instance."
-msgstr ""
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "[<remote>:]<profile> <name>..."
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/profile.go:709
+#, fuzzy
+msgid "[<remote>:]<profile> <new-name>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/profile.go:241
+#, fuzzy
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+#, fuzzy
+msgid "[<remote>:]<project>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/project.go:332 lxc/project.go:595
+#, fuzzy
+msgid "[<remote>:]<project> <key>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/project.go:535
+#, fuzzy
+msgid "[<remote>:]<project> <key>=<value>..."
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/project.go:479
+#, fuzzy
+msgid "[<remote>:]<project> <new-name>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/copy.go:37
+#, fuzzy
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
+
+#: lxc/config.go:87 lxc/config.go:608
+#, fuzzy
+msgid "[<remote>:][<instance>[/<snapshot>]]"
+msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
+
+#: lxc/info.go:31
+#, fuzzy
+msgid "[<remote>:][<instance>]"
+msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
+
+#: lxc/config.go:358 lxc/config.go:732
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/config.go:450
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>=<value>..."
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
+msgstr ""
+
+#: lxc/init.go:38
+#, fuzzy
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/project.go:451
+#, fuzzy
+msgid "current"
+msgstr "Swap (courant)"
+
+#: lxc/remote.go:510
+msgid "default"
+msgstr "par défaut"
+
+#: lxc/storage.go:446
+msgid "description"
+msgstr ""
+
+#: lxc/image.go:889
+msgid "disabled"
+msgstr "désactivé"
+
+#: lxc/storage.go:445
+msgid "driver"
+msgstr ""
+
+#: lxc/image.go:891
+msgid "enabled"
+msgstr "activé"
+
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
+msgstr "erreur : %v"
+
+#: lxc/info.go:578
+#, fuzzy, c-format
+msgid "expires at %s"
+msgstr "Expire : %s"
+
+#: lxc/storage.go:443
+msgid "info"
+msgstr ""
+
+#: lxc/alias.go:56
+msgid ""
+"lxc alias add list \"list -c ns46S\"\n"
+"    Overwrite the \"list\" command to pass -c ns46S."
+msgstr ""
+
+#: lxc/alias.go:197
+msgid ""
+"lxc alias remove my-list\n"
+"    Remove the \"my-list\" alias."
+msgstr ""
+
+#: lxc/alias.go:146
+msgid ""
+"lxc alias rename list my-list\n"
+"    Rename existing alias \"list\" to \"my-list\"."
+msgstr ""
+
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
+#: lxc/config_device.go:79
+msgid ""
+"lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the instance."
+msgstr ""
 
 #: lxc/config.go:91
 msgid ""
@@ -4629,48 +4993,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-#, fuzzy
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/move.go:33
-#, fuzzy
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-#, fuzzy
-msgid "network"
-msgstr "Nom du réseau"
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr "non"
@@ -4679,524 +5005,232 @@ msgstr "non"
 msgid "ok (y/n)?"
 msgstr "ok (y/n) ?"
 
-#: lxc/operation.go:22
-#, fuzzy
-msgid "operation"
-msgstr "Propriétés :"
+#: lxc/config.go:53
+msgid "please use `lxc profile`"
+msgstr ""
 
-#: lxc/config_device.go:334
-#, fuzzy
-msgid "override [<remote>:]<instance> <device> [key=value...]"
+#: lxc/storage.go:448
+msgid "space used"
 msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/action.go:48
-#, fuzzy
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+#: lxc/info.go:582
+msgid "stateful"
+msgstr "à suivi d'état"
+
+#: lxc/info.go:584
+msgid "stateless"
+msgstr "sans suivi d'état"
+
+#: lxc/info.go:574
+#, c-format
+msgid "taken at %s"
+msgstr "pris à %s"
+
+#: lxc/storage.go:447
+msgid "total space"
 msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:53
-msgid "please use `lxc profile`"
+#: lxc/version.go:48
+msgid "unreachable"
 msgstr ""
 
-#: lxc/profile.go:27
-#, fuzzy
-msgid "profile"
-msgstr "Profils : %s"
+#: lxc/storage.go:442
+msgid "used by"
+msgstr ""
 
-#: lxc/project.go:27
-msgid "project"
+#: lxc/remote.go:270
+msgid "y"
 msgstr ""
 
-#: lxc/publish.go:29
+#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
+#: lxc/image.go:1069
+msgid "yes"
+msgstr "oui"
+
 #, fuzzy
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-"Publier des conteneurs en tant qu'images.\n"
-"\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
+#~ msgid "assign [<remote>:]<instance> <profiles>"
+#~ msgstr "impossible de supprimer le serveur distant par défaut"
 
-#: lxc/file.go:215
 #, fuzzy
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
-#: lxc/file.go:405
-#, fuzzy
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-#, fuzzy
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/remote.go:31
-#, fuzzy
-msgid "remote"
-msgstr "Serveur distant : %s"
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-#, fuzzy
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/profile.go:634
-#, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-#, fuzzy
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-#, fuzzy
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-#, fuzzy
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-#, fuzzy
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/restore.go:22
-#, fuzzy
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
+#~ msgid "console [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1587
 #, fuzzy
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
+#~ msgid "create [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:519
 #, fuzzy
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "delete [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:1022
 #, fuzzy
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
+#~ msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1303
 #, fuzzy
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "get-default"
+#~ msgstr "par défaut"
 
-#: lxc/config_device.go:526
 #, fuzzy
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "list [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:760
 #, fuzzy
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "network"
+#~ msgstr "Nom du réseau"
 
-#: lxc/project.go:535
 #, fuzzy
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "operation"
+#~ msgstr "Propriétés :"
 
-#: lxc/config.go:450
 #, fuzzy
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
+#~ msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
 #, fuzzy
-msgid "show [<remote>:]<instance>"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
+#~ msgid "profile"
+#~ msgstr "Profils : %s"
 
-#: lxc/config_template.go:293
 #, fuzzy
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
+#~ msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1379
 #, fuzzy
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
+#~ msgid "remove [<remote>:]<instance> <profile>"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:608
 #, fuzzy
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
+#~ msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/snapshot.go:25
 #, fuzzy
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
+#~ msgid "show [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Supprimer des conteneurs ou des instantanés.\n"
+#~ "\n"
+#~ "lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+#~ "<snapshot>]...]\n"
+#~ "\n"
+#~ "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+#~ "(configuration, instantanés, …)."
 
-#: lxc/storage_volume.go:1511
 #, fuzzy
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
-#: lxc/storage.go:448
-msgid "space used"
-msgstr ""
+#~ msgid "show [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Supprimer des conteneurs ou des instantanés.\n"
+#~ "\n"
+#~ "lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+#~ "<snapshot>]...]\n"
+#~ "\n"
+#~ "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+#~ "(configuration, instantanés, …)."
 
-#: lxc/action.go:29
 #, fuzzy
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/info.go:582
-msgid "stateful"
-msgstr "à suivi d'état"
-
-#: lxc/info.go:584
-msgid "stateless"
-msgstr "sans suivi d'état"
+#~ msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgstr ""
+#~ "Supprimer des conteneurs ou des instantanés.\n"
+#~ "\n"
+#~ "lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+#~ "<snapshot>]...]\n"
+#~ "\n"
+#~ "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+#~ "(configuration, instantanés, …)."
 
-#: lxc/action.go:89
 #, fuzzy
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
+#~ msgid "show [<remote>:][<instance>[/<snapshot>]]"
+#~ msgstr ""
+#~ "Supprimer des conteneurs ou des instantanés.\n"
+#~ "\n"
+#~ "lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+#~ "<snapshot>]...]\n"
+#~ "\n"
+#~ "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+#~ "(configuration, instantanés, …)."
 
-#: lxc/remote.go:649
 #, fuzzy
-msgid "switch <remote>"
-msgstr "impossible de supprimer le serveur distant par défaut"
+#~ msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
+#~ msgstr ""
+#~ "Supprimer des conteneurs ou des instantanés.\n"
+#~ "\n"
+#~ "lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+#~ "<snapshot>]...]\n"
+#~ "\n"
+#~ "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+#~ "(configuration, instantanés, …)."
 
-#: lxc/project.go:677
 #, fuzzy
-msgid "switch [<remote>:]<project>"
-msgstr "impossible de supprimer le serveur distant par défaut"
-
-#: lxc/info.go:574
-#, c-format
-msgid "taken at %s"
-msgstr "pris à %s"
-
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
-#: lxc/storage.go:447
-msgid "total space"
-msgstr ""
-
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
-#: lxc/version.go:48
-msgid "unreachable"
-msgstr ""
+#~ msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:698
 #, fuzzy
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
+#~ msgid "switch <remote>"
+#~ msgstr "impossible de supprimer le serveur distant par défaut"
 
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
 #, fuzzy
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
+#~ msgid "switch [<remote>:]<project>"
+#~ msgstr "impossible de supprimer le serveur distant par défaut"
 
-#: lxc/project.go:595
 #, fuzzy
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "unset [<remote>:]<instance> <device> <key>"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:732
 #, fuzzy
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/storage.go:442
-msgid "used by"
-msgstr ""
-
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
+#~ msgid "unset [<remote>:]<profile> <device> <key>"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:31
 #, fuzzy
-msgid "volume"
-msgstr "Colonnes"
-
-#: lxc/remote.go:270
-msgid "y"
-msgstr ""
-
-#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
-#: lxc/image.go:1069
-msgid "yes"
-msgstr "oui"
+#~ msgid "unset [<remote>:]<project> <key>"
+#~ msgstr ""
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #, fuzzy
-#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgid "unset [<remote>:][<instance>] <key>"
 #~ msgstr ""
-#~ "Supprimer des conteneurs ou des instantanés.\n"
-#~ "\n"
-#~ "lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-#~ "<snapshot>]...]\n"
+#~ "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 #~ "\n"
-#~ "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-#~ "(configuration, instantanés, …)."
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#, fuzzy
+#~ msgid "volume"
+#~ msgstr "Colonnes"
 
 #, fuzzy
 #~ msgid "Show storage volum configurations"
diff --git a/po/hi.po b/po/hi.po
index bd2b8c11bd..d3ed08f782 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 05076d4963..e726947716 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index d047ce23d0..23110b2179 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Luigi Operoso <brokenpip3 at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -356,6 +356,54 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+#, fuzzy
+msgid "<alias>"
+msgstr "Alias:"
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+#, fuzzy
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr "Creazione del container in corso"
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
@@ -3552,407 +3600,483 @@ msgstr "Occorre specificare un nome di container come origine"
 msgid "You must specify a source instance name"
 msgstr "Occorre specificare un nome di container come origine"
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
-msgstr ""
-
-#: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
-msgstr ""
+#: lxc/storage_volume.go:707
+#, fuzzy
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:78
+#: lxc/storage_volume.go:221
 #, fuzzy
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
 msgstr "Creazione del container in corso"
 
-#: lxc/profile.go:99
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
 #, fuzzy
-msgid "add [<remote>:]<instance> <profile>"
+msgid "[<remote>:]"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:83
+#: lxc/import.go:26
 #, fuzzy
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+msgid "[<remote>:] <backup file>"
 msgstr "Creazione del container in corso"
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
-msgstr ""
+#: lxc/config_trust.go:55
+#, fuzzy
+msgid "[<remote>:] <cert>"
+msgstr "Creazione del container in corso"
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
+#: lxc/config_trust.go:190
 #, fuzzy
-msgid "alias"
-msgstr "Alias:"
+msgid "[<remote>:] <hostname|fingerprint>"
+msgstr "Creazione del container in corso"
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
-msgstr ""
+#: lxc/cluster.go:335
+#, fuzzy
+msgid "[<remote>:] <name>"
+msgstr "Creazione del container in corso"
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
-msgstr ""
+#: lxc/image.go:972 lxc/list.go:42
+#, fuzzy
+msgid "[<remote>:] [<filter>...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
-msgstr ""
+#: lxc/image_alias.go:147
+#, fuzzy
+msgid "[<remote>:] [<filters>...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
-msgstr ""
+#: lxc/query.go:30
+#, fuzzy
+msgid "[<remote>:]<API path>"
+msgstr "Creazione del container in corso"
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
-msgstr ""
+#: lxc/image_alias.go:102
+#, fuzzy
+msgid "[<remote>:]<alias>"
+msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:29
-msgid "cluster"
-msgstr ""
+#: lxc/image_alias.go:56
+#, fuzzy
+msgid "[<remote>:]<alias> <fingerprint>"
+msgstr "Creazione del container in corso"
 
-#: lxc/config.go:28
-msgid "config"
-msgstr ""
+#: lxc/image_alias.go:249
+#, fuzzy
+msgid "[<remote>:]<alias> <new-name>"
+msgstr "Creazione del container in corso"
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
-msgstr ""
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "[<remote>:]<cluster member>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
-msgstr ""
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+#, fuzzy
+msgid "[<remote>:]<image>"
+msgstr "Creazione del container in corso"
 
 #: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
-msgstr ""
-
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
-msgstr ""
+#, fuzzy
+msgid "[<remote>:]<image> <remote>:"
+msgstr "Creazione del container in corso"
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
-msgstr ""
+#: lxc/launch.go:23
+#, fuzzy
+msgid "[<remote>:]<image> [<remote>:][<name>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
-msgstr ""
+#: lxc/image.go:451
+#, fuzzy
+msgid "[<remote>:]<image> [<target>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/config_template.go:63
+#: lxc/image.go:274 lxc/image.go:1271
 #, fuzzy
-msgid "create [<remote>:]<instance> <template>"
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr "Creazione del container in corso"
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
-msgstr ""
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+#, fuzzy
+msgid "[<remote>:]<instance>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
-msgstr ""
+#: lxc/config_device.go:188 lxc/config_device.go:698
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <key>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
-msgstr ""
+#: lxc/config_device.go:519
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
+msgstr "Creazione del container in corso"
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
-msgstr ""
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
-msgstr ""
+#: lxc/config_device.go:334
+#, fuzzy
+msgid "[<remote>:]<instance> <device> [key=value...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/project.go:451
-msgid "current"
-msgstr ""
+#: lxc/config_device.go:423
+#, fuzzy
+msgid "[<remote>:]<instance> <name>..."
+msgstr "Creazione del container in corso"
 
-#: lxc/remote.go:510
-msgid "default"
-msgstr ""
+#: lxc/profile.go:99 lxc/profile.go:634
+#, fuzzy
+msgid "[<remote>:]<instance> <profile>"
+msgstr "Creazione del container in corso"
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
-msgstr ""
+#: lxc/profile.go:161
+#, fuzzy
+msgid "[<remote>:]<instance> <profiles>"
+msgstr "Creazione del container in corso"
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
+#: lxc/restore.go:22
+#, fuzzy
+msgid "[<remote>:]<instance> <snapshot>"
+msgstr "Creazione del container in corso"
 
-#: lxc/config_template.go:105
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
 #, fuzzy
-msgid "delete [<remote>:]<instance> <template>"
+msgid "[<remote>:]<instance> <template>"
 msgstr "Creazione del container in corso"
 
-#: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
-msgstr ""
+#: lxc/snapshot.go:25
+#, fuzzy
+msgid "[<remote>:]<instance> [<snapshot name>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/delete.go:27
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
 #, fuzzy
-msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr "Creazione del container in corso"
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
-msgstr ""
+#: lxc/exec.go:38
+#, fuzzy
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
+msgstr "Creazione del container in corso"
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
-msgstr ""
+#: lxc/file.go:152
+#, fuzzy
+msgid "[<remote>:]<instance>/<path>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
+#: lxc/file.go:102
+#, fuzzy
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
-msgstr ""
+#: lxc/file.go:215
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
+msgstr "Creazione del container in corso"
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
-msgstr ""
+#: lxc/rename.go:19
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage.go:446
-msgid "description"
-msgstr ""
+#: lxc/publish.go:29
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
-msgstr ""
+#: lxc/move.go:33
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
+#: lxc/delete.go:27
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
-msgstr ""
+#: lxc/cluster.go:152 lxc/cluster.go:251
+#, fuzzy
+msgid "[<remote>:]<member>"
+msgstr "Creazione del container in corso"
 
-#: lxc/network.go:462
+#: lxc/cluster.go:201
 #, fuzzy
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+msgid "[<remote>:]<member> <new-name>"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:22
-msgid "device"
-msgstr ""
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+#, fuzzy
+msgid "[<remote>:]<network>"
+msgstr "Creazione del container in corso"
 
-#: lxc/image.go:889
-msgid "disabled"
-msgstr ""
+#: lxc/network.go:377
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage.go:445
-msgid "driver"
-msgstr ""
+#: lxc/network.go:107
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:420
+#: lxc/network.go:670 lxc/network.go:1154
 #, fuzzy
-msgid "edit [<remote>:]<cluster member>"
+msgid "[<remote>:]<network> <key>"
 msgstr "Creazione del container in corso"
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
-msgstr ""
+#: lxc/network.go:1022
+#, fuzzy
+msgid "[<remote>:]<network> <key>=<value>..."
+msgstr "Creazione del container in corso"
 
-#: lxc/config_metadata.go:50
+#: lxc/network.go:971
 #, fuzzy
-msgid "edit [<remote>:]<instance>"
+msgid "[<remote>:]<network> <new-name>"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_template.go:148
+#: lxc/network.go:462
 #, fuzzy
-msgid "edit [<remote>:]<instance> <template>"
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr "Creazione del container in corso"
 
-#: lxc/file.go:152
+#: lxc/network.go:180
 #, fuzzy
-msgid "edit [<remote>:]<instance>/<path>"
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr "Creazione del container in corso"
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
-msgstr ""
+#: lxc/network.go:253
+#, fuzzy
+msgid "[<remote>:]<network> [key=value...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
-msgstr ""
+#: lxc/operation.go:50 lxc/operation.go:179
+#, fuzzy
+msgid "[<remote>:]<operation>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+#, fuzzy
+msgid "[<remote>:]<pool>"
+msgstr "Creazione del container in corso"
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
-msgstr ""
+#: lxc/storage.go:87
+#, fuzzy
+msgid "[<remote>:]<pool> <driver> [key=value...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
-msgstr ""
+#: lxc/storage.go:331 lxc/storage.go:733
+#, fuzzy
+msgid "[<remote>:]<pool> <key>"
+msgstr "Creazione del container in corso"
 
-#: lxc/config.go:87
+#: lxc/storage.go:580
 #, fuzzy
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
-msgstr ""
+#: lxc/storage_volume.go:1190
+#, fuzzy
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/image.go:891
-msgid "enabled"
-msgstr ""
+#: lxc/storage_volume.go:625
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
-msgstr ""
+#: lxc/storage_volume.go:138
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+msgstr "Creazione del container in corso"
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
-msgstr ""
+#: lxc/storage_volume.go:1478
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>"
+msgstr "Creazione del container in corso"
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
-msgstr ""
+#: lxc/storage_volume.go:1303
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
+msgstr "Creazione del container in corso"
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
-msgstr ""
+#: lxc/storage_volume.go:1587
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <snapshot>"
+msgstr "Creazione del container in corso"
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
-msgstr ""
+#: lxc/storage_volume.go:1511
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
+msgstr "Creazione del container in corso"
 
-#: lxc/file.go:70
-msgid "file"
-msgstr ""
+#: lxc/storage_volume.go:470
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [key=value...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:188
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
 #, fuzzy
-msgid "get [<remote>:]<instance> <device> <key>"
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr "Creazione del container in corso"
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
-msgstr ""
+#: lxc/storage_volume.go:988
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
-msgstr ""
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+#, fuzzy
+msgid "[<remote>:]<profile>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
-msgstr ""
+#: lxc/config_device.go:190 lxc/config_device.go:700
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>"
+msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:190
+#: lxc/config_device.go:526
 #, fuzzy
-msgid "get [<remote>:]<profile> <device> <key>"
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr "Creazione del container in corso"
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
-msgstr ""
+#: lxc/config_device.go:83
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
-msgstr ""
+#: lxc/profile.go:526 lxc/profile.go:873
+#, fuzzy
+msgid "[<remote>:]<profile> <key>"
+msgstr "Creazione del container in corso"
 
-#: lxc/config.go:358
+#: lxc/profile.go:760
 #, fuzzy
-msgid "get [<remote>:][<instance>] <key>"
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr "Creazione del container in corso"
 
-#: lxc/remote.go:421
-msgid "get-default"
-msgstr ""
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "[<remote>:]<profile> <name>..."
+msgstr "Creazione del container in corso"
 
-#: lxc/image.go:36
-msgid "image"
-msgstr ""
+#: lxc/profile.go:709
+#, fuzzy
+msgid "[<remote>:]<profile> <new-name>"
+msgstr "Creazione del container in corso"
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
-msgstr ""
+#: lxc/profile.go:241
+#, fuzzy
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
+msgstr "Creazione del container in corso"
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
-msgstr ""
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+#, fuzzy
+msgid "[<remote>:]<project>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage.go:443
-msgid "info"
-msgstr ""
+#: lxc/project.go:332 lxc/project.go:595
+#, fuzzy
+msgid "[<remote>:]<project> <key>"
+msgstr "Creazione del container in corso"
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
-msgstr ""
+#: lxc/project.go:535
+#, fuzzy
+msgid "[<remote>:]<project> <key>=<value>..."
+msgstr "Creazione del container in corso"
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
-msgstr ""
+#: lxc/project.go:479
+#, fuzzy
+msgid "[<remote>:]<project> <new-name>"
+msgstr "Creazione del container in corso"
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
-msgstr ""
+#: lxc/copy.go:37
+#, fuzzy
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+msgstr "Creazione del container in corso"
+
+#: lxc/config.go:87 lxc/config.go:608
+#, fuzzy
+msgid "[<remote>:][<instance>[/<snapshot>]]"
+msgstr "Creazione del container in corso"
 
 #: lxc/info.go:31
 #, fuzzy
-msgid "info [<remote>:][<instance>]"
+msgid "[<remote>:][<instance>]"
 msgstr "Creazione del container in corso"
 
-#: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+#: lxc/config.go:358 lxc/config.go:732
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>"
+msgstr "Creazione del container in corso"
+
+#: lxc/config.go:450
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>=<value>..."
+msgstr "Creazione del container in corso"
+
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:38
+#, fuzzy
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgstr "Creazione del container in corso"
+
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-#, fuzzy
-msgid "list [<remote>:]<instance>"
-msgstr "Creazione del container in corso"
+#: lxc/image.go:891
+msgid "enabled"
+msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-#, fuzzy
-msgid "list [<remote>:]<profile>"
-msgstr "Creazione del container in corso"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
+msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4184,36 +4308,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-#, fuzzy
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr "Creazione del container in corso"
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr "no"
@@ -4222,249 +4320,14 @@ msgstr "no"
 msgid "ok (y/n)?"
 msgstr "ok (y/n)?"
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-#, fuzzy
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr "Creazione del container in corso"
-
-#: lxc/action.go:48
-#, fuzzy
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "Creazione del container in corso"
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-#, fuzzy
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr "Creazione del container in corso"
-
-#: lxc/profile.go:634
-#, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr "Creazione del container in corso"
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-#, fuzzy
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr "Creazione del container in corso"
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-#, fuzzy
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr "Creazione del container in corso"
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-#, fuzzy
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "Creazione del container in corso"
-
-#: lxc/restore.go:22
-#, fuzzy
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr "Creazione del container in corso"
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-#, fuzzy
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr "Creazione del container in corso"
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-#, fuzzy
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr "Creazione del container in corso"
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-#, fuzzy
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr "Creazione del container in corso"
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-#, fuzzy
-msgid "show [<remote>:]<instance>"
-msgstr "Creazione del container in corso"
-
-#: lxc/config_template.go:293
-#, fuzzy
-msgid "show [<remote>:]<instance> <template>"
-msgstr "Creazione del container in corso"
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-#, fuzzy
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr "Creazione del container in corso"
-
-#: lxc/snapshot.go:25
-#, fuzzy
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr "Creazione del container in corso"
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-#, fuzzy
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "Creazione del container in corso"
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4473,106 +4336,88 @@ msgstr ""
 msgid "stateless"
 msgstr "senza stato"
 
-#: lxc/action.go:89
-#, fuzzy
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "Creazione del container in corso"
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-#, fuzzy
-msgid "switch [<remote>:]<project>"
-msgstr "Creazione del container in corso"
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr "salvato alle %s"
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-#, fuzzy
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr "Creazione del container in corso"
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
+#: lxc/storage.go:442
+msgid "used by"
 msgstr ""
 
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
+#: lxc/remote.go:270
+msgid "y"
 msgstr ""
 
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
+#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
+#: lxc/image.go:1069
+msgid "yes"
+msgstr "si"
 
-#: lxc/config_device.go:700
 #, fuzzy
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr "Creazione del container in corso"
+#~ msgid "create [<remote>:]<instance> <template>"
+#~ msgstr "Creazione del container in corso"
 
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
+#, fuzzy
+#~ msgid "delete [<remote>:]<instance> <template>"
+#~ msgstr "Creazione del container in corso"
 
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
+#, fuzzy
+#~ msgid "list [<remote>:]<instance>"
+#~ msgstr "Creazione del container in corso"
 
-#: lxc/config.go:732
 #, fuzzy
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr "Creazione del container in corso"
+#~ msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "Creazione del container in corso"
 
-#: lxc/storage.go:442
-msgid "used by"
-msgstr ""
+#, fuzzy
+#~ msgid "remove [<remote>:]<instance> <profile>"
+#~ msgstr "Creazione del container in corso"
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
+#, fuzzy
+#~ msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "Creazione del container in corso"
 
-#: lxc/storage_volume.go:31
 #, fuzzy
-msgid "volume"
-msgstr "Colonne"
+#~ msgid "show [<remote>:]<instance>"
+#~ msgstr "Creazione del container in corso"
 
-#: lxc/remote.go:270
-msgid "y"
-msgstr ""
+#, fuzzy
+#~ msgid "show [<remote>:]<instance> <template>"
+#~ msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
-#: lxc/image.go:1069
-msgid "yes"
-msgstr "si"
+#, fuzzy
+#~ msgid "show [<remote>:][<instance>[/<snapshot>]]"
+#~ msgstr "Creazione del container in corso"
+
+#, fuzzy
+#~ msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "Creazione del container in corso"
+
+#, fuzzy
+#~ msgid "unset [<remote>:]<instance> <device> <key>"
+#~ msgstr "Creazione del container in corso"
+
+#, fuzzy
+#~ msgid "unset [<remote>:]<profile> <device> <key>"
+#~ msgstr "Creazione del container in corso"
 
 #, fuzzy
-#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgid "unset [<remote>:][<instance>] <key>"
 #~ msgstr "Creazione del container in corso"
 
+#, fuzzy
+#~ msgid "volume"
+#~ msgstr "Colonne"
+
 #~ msgid "ARCH"
 #~ msgstr "ARCH"
 
diff --git a/po/ja.po b/po/ja.po
index 3001930b2f..c5f062de06 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2020-07-31 19:11+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -357,6 +357,67 @@ msgstr "--refresh はインスタンスの場合のみ使えます"
 msgid "--target cannot be used with instances"
 msgstr "--target はインスタンスでは使えません"
 
+#: lxc/alias.go:192
+#, fuzzy
+msgid "<alias>"
+msgstr "alias"
+
+#: lxc/alias.go:52
+#, fuzzy
+msgid "<alias> <target>"
+msgstr "add <alias> <target>"
+
+#: lxc/alias.go:141
+#, fuzzy
+msgid "<old alias> <new alias>"
+msgstr "rename <old alias> <new alias>"
+
+#: lxc/storage_volume.go:1158
+#, fuzzy
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr "move [<pool>/]<volume> [<pool>/]<volume>"
+
+#: lxc/storage_volume.go:307
+#, fuzzy
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+
+#: lxc/remote.go:598 lxc/remote.go:649
+#, fuzzy
+msgid "<remote>"
+msgstr "remote"
+
+#: lxc/remote.go:687
+#, fuzzy
+msgid "<remote> <URL>"
+msgstr "set-url <remote> <URL>"
+
+#: lxc/remote.go:536
+#, fuzzy
+msgid "<remote> <new-name>"
+msgstr "rename <remote> <new-name>"
+
+#: lxc/file.go:405
+#, fuzzy
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
+"<path>...]"
+
+#: lxc/image.go:610
+#, fuzzy
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
+"[key=value...]"
+
+#: lxc/manpage.go:18
+#, fuzzy
+msgid "<target>"
+msgstr "manpage <target>"
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
@@ -3782,404 +3843,499 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr "コピー元のインスタンス名を指定してください"
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
-msgstr "add <alias> <target>"
+#: lxc/storage_volume.go:707
+#, fuzzy
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+
+#: lxc/storage_volume.go:221
+#, fuzzy
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+#, fuzzy
+msgid "[<remote>:]"
+msgstr "list [<remote>:]"
+
+#: lxc/import.go:26
+#, fuzzy
+msgid "[<remote>:] <backup file>"
+msgstr "import [<remote>:] <backup file>"
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+#, fuzzy
+msgid "[<remote>:] <cert>"
 msgstr "add [<remote>:] <cert>"
 
-#: lxc/config_device.go:78
+#: lxc/config_trust.go:190
 #, fuzzy
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
-msgstr "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgid "[<remote>:] <hostname|fingerprint>"
+msgstr "remove [<remote>:] <hostname|fingerprint>"
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
-msgstr "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+#, fuzzy
+msgid "[<remote>:] <name>"
+msgstr "enable [<remote>:] <name>"
 
-#: lxc/config_device.go:83
+#: lxc/image.go:972 lxc/list.go:42
 #, fuzzy
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
-msgstr "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgid "[<remote>:] [<filter>...]"
+msgstr "list [<remote>:] [<filter>...]"
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
-msgstr "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+#, fuzzy
+msgid "[<remote>:] [<filters>...]"
+msgstr "list [<remote>:] [<filters>...]"
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
-msgstr "alias"
+#: lxc/query.go:30
+#, fuzzy
+msgid "[<remote>:]<API path>"
+msgstr "query [<remote>:]<API path>"
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
-msgstr "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+#, fuzzy
+msgid "[<remote>:]<alias>"
+msgstr "delete [<remote>:]<alias>"
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
-msgstr ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+#, fuzzy
+msgid "[<remote>:]<alias> <fingerprint>"
+msgstr "create [<remote>:]<alias> <fingerprint>"
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
-msgstr "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+#, fuzzy
+msgid "[<remote>:]<alias> <new-name>"
+msgstr "rename [<remote>:]<alias> <new-name>"
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
-msgstr ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "[<remote>:]<cluster member>"
+msgstr "edit [<remote>:]<cluster member>"
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
-msgstr ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+#, fuzzy
+msgid "[<remote>:]<image>"
+msgstr "edit [<remote>:]<image>"
 
-#: lxc/cluster.go:29
-msgid "cluster"
-msgstr "cluster"
+#: lxc/image.go:126
+#, fuzzy
+msgid "[<remote>:]<image> <remote>:"
+msgstr "copy [<remote>:]<image> <remote>:"
 
-#: lxc/config.go:28
-msgid "config"
-msgstr "config"
+#: lxc/launch.go:23
+#, fuzzy
+msgid "[<remote>:]<image> [<remote>:][<name>]"
+msgstr "launch [<remote>:]<image> [<remote>:][<name>]"
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
-msgstr "console [<remote>:]<instance>"
+#: lxc/image.go:451
+#, fuzzy
+msgid "[<remote>:]<image> [<target>]"
+msgstr "export [<remote>:]<image> [<target>]"
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
-msgstr "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+#, fuzzy
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
+msgstr "delete [<remote>:]<image> [[<remote>:]<image>...]"
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
-msgstr "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+#, fuzzy
+msgid "[<remote>:]<instance>"
+msgstr "edit [<remote>:]<instance>"
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
-msgstr "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <key>"
+msgstr "get [<remote>:]<instance|profile> <device> <key>"
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
-msgstr "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
+msgstr "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
-msgstr "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
+msgstr "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
-msgstr "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+#, fuzzy
+msgid "[<remote>:]<instance> <device> [key=value...]"
+msgstr "override [<remote>:]<instance> <device> [key=value...]"
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
-msgstr "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+#, fuzzy
+msgid "[<remote>:]<instance> <name>..."
+msgstr "remove [<remote>:]<instance|profile> <name>..."
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
-msgstr "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+#, fuzzy
+msgid "[<remote>:]<instance> <profile>"
+msgstr "add [<remote>:]<instance> <profile>"
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
-msgstr "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+#, fuzzy
+msgid "[<remote>:]<instance> <profiles>"
+msgstr "add [<remote>:]<instance> <profile>"
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
-msgstr "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+#, fuzzy
+msgid "[<remote>:]<instance> <snapshot>"
+msgstr "restore [<remote>:]<instance> <snapshot>"
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
-msgstr "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+#, fuzzy
+msgid "[<remote>:]<instance> <template>"
+msgstr "edit [<remote>:]<instance> <template>"
 
-#: lxc/project.go:451
-msgid "current"
-msgstr "現在値"
+#: lxc/snapshot.go:25
+#, fuzzy
+msgid "[<remote>:]<instance> [<snapshot name>]"
+msgstr "snapshot [<remote>:]<instance> [<snapshot name>]"
 
-#: lxc/remote.go:510
-msgid "default"
-msgstr "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+#, fuzzy
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
-msgstr "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+#, fuzzy
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
+msgstr "exec [<remote>:]<instance> [flags] [--] <command line>"
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+#, fuzzy
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
-msgstr "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+#, fuzzy
+msgid "[<remote>:]<instance>/<path>"
+msgstr "edit [<remote>:]<instance>/<path>"
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+#, fuzzy
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
+#, fuzzy
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
-msgstr "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
+msgstr "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
-msgstr "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
+msgstr ""
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
-msgstr "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
+msgstr ""
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
+msgstr ""
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
+"<snapshot>]...]"
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
-msgstr "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+#, fuzzy
+msgid "[<remote>:]<member>"
+msgstr "show [<remote>:]<member>"
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
-msgstr "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+#, fuzzy
+msgid "[<remote>:]<member> <new-name>"
+msgstr "rename [<remote>:]<member> <new-name>"
 
-#: lxc/storage.go:446
-msgid "description"
-msgstr "説明"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+#, fuzzy
+msgid "[<remote>:]<network>"
+msgstr "edit [<remote>:]<network>"
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr "detach [<remote>:]<network> <instance> [<device name>]"
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
+#: lxc/network.go:107
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
+msgstr ""
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
-msgstr "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+#, fuzzy
+msgid "[<remote>:]<network> <key>"
+msgstr "get [<remote>:]<network> <key>"
+
+#: lxc/network.go:1022
+#, fuzzy
+msgid "[<remote>:]<network> <key>=<value>..."
+msgstr "set [<remote>:]<network> <key>=<value>..."
+
+#: lxc/network.go:971
+#, fuzzy
+msgid "[<remote>:]<network> <new-name>"
+msgstr "rename [<remote>:]<network> <new-name>"
 
 #: lxc/network.go:462
 #, fuzzy
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr "detach-profile [<remote>:]<network> <instance> [<device name>]"
 
-#: lxc/config_device.go:22
-msgid "device"
-msgstr "device"
-
-#: lxc/image.go:889
-msgid "disabled"
-msgstr "無効"
-
-#: lxc/storage.go:445
-msgid "driver"
-msgstr "ドライバ"
-
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
-msgstr "edit [<remote>:]<cluster member>"
-
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
-msgstr "edit [<remote>:]<image>"
-
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
-msgstr "edit [<remote>:]<instance>"
-
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
-msgstr "edit [<remote>:]<instance> <template>"
+#: lxc/network.go:180
+#, fuzzy
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
+msgstr ""
+"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
+"name>]"
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
-msgstr "edit [<remote>:]<instance>/<path>"
+#: lxc/network.go:253
+#, fuzzy
+msgid "[<remote>:]<network> [key=value...]"
+msgstr "create [<remote>:]<network> [key=value...]"
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
-msgstr "edit [<remote>:]<network>"
+#: lxc/operation.go:50 lxc/operation.go:179
+#, fuzzy
+msgid "[<remote>:]<operation>"
+msgstr "show [<remote>:]<operation>"
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+#, fuzzy
+msgid "[<remote>:]<pool>"
 msgstr "edit [<remote>:]<pool>"
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr "edit [<remote>:]<pool> <volume>[/<snapshot>]"
-
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
-msgstr "edit [<remote>:]<profile>"
-
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
-msgstr "edit [<remote>:]<project>"
-
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
-msgstr "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage.go:87
+#, fuzzy
+msgid "[<remote>:]<pool> <driver> [key=value...]"
+msgstr "create [<remote>:]<pool> <driver> [key=value...]"
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
-msgstr "enable [<remote>:] <name>"
+#: lxc/storage.go:331 lxc/storage.go:733
+#, fuzzy
+msgid "[<remote>:]<pool> <key>"
+msgstr "get [<remote>:]<pool> <key>"
 
-#: lxc/image.go:891
-msgid "enabled"
-msgstr "有効"
+#: lxc/storage.go:580
+#, fuzzy
+msgid "[<remote>:]<pool> <key> <value>"
+msgstr "set [<remote>:]<pool> <key> <value>"
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
-msgstr "エラー: %v"
+#: lxc/storage_volume.go:1190
+#, fuzzy
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
+msgstr ""
+"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
+"snapshot name>]"
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
-msgstr "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:625
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
+msgstr "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
-msgstr "%s に失効"
+#: lxc/storage_volume.go:138
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+msgstr "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
-msgstr "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:1478
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>"
+msgstr "unset [<remote>:]<pool> <volume> <key>"
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
-msgstr ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/storage_volume.go:1303
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
+msgstr "set [<remote>:]<pool> <volume> <key>=<value>..."
 
-#: lxc/file.go:70
-msgid "file"
-msgstr "file"
+#: lxc/storage_volume.go:1587
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <snapshot>"
+msgstr "restore [<remote>:]<pool> <volume> <snapshot>"
 
-#: lxc/config_device.go:188
+#: lxc/storage_volume.go:1511
 #, fuzzy
-msgid "get [<remote>:]<instance> <device> <key>"
-msgstr "get [<remote>:]<instance|profile> <device> <key>"
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
+msgstr "edit [<remote>:]<pool> <volume>[/<snapshot>]"
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
-msgstr "get [<remote>:]<network> <key>"
+#: lxc/storage_volume.go:470
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [key=value...]"
+msgstr "create [<remote>:]<pool> <volume> [key=value...]"
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
-msgstr "get [<remote>:]<pool> <key>"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
+msgstr "edit [<remote>:]<pool> <volume>[/<snapshot>]"
 
 #: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 
-#: lxc/config_device.go:190
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+#, fuzzy
+msgid "[<remote>:]<profile>"
+msgstr "edit [<remote>:]<profile>"
+
+#: lxc/config_device.go:190 lxc/config_device.go:700
 #, fuzzy
-msgid "get [<remote>:]<profile> <device> <key>"
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr "get [<remote>:]<instance|profile> <device> <key>"
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
+msgstr "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+
+#: lxc/config_device.go:83
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
+msgstr "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+
+#: lxc/profile.go:526 lxc/profile.go:873
+#, fuzzy
+msgid "[<remote>:]<profile> <key>"
 msgstr "get [<remote>:]<profile> <key>"
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
-msgstr "get [<remote>:]<project> <key>"
+#: lxc/profile.go:760
+#, fuzzy
+msgid "[<remote>:]<profile> <key><value>..."
+msgstr "set [<remote>:]<profile> <key><value>..."
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
-msgstr "get [<remote>:][<instance>] <key>"
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "[<remote>:]<profile> <name>..."
+msgstr "remove [<remote>:]<instance|profile> <name>..."
 
-#: lxc/remote.go:421
-msgid "get-default"
-msgstr "get-default"
+#: lxc/profile.go:709
+#, fuzzy
+msgid "[<remote>:]<profile> <new-name>"
+msgstr "rename [<remote>:]<profile> <new-name>"
 
-#: lxc/image.go:36
-msgid "image"
-msgstr "image"
+#: lxc/profile.go:241
+#, fuzzy
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
+msgstr "copy [<remote>:]<profile> [<remote>:]<profile>"
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
-msgstr ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+#, fuzzy
+msgid "[<remote>:]<project>"
+msgstr "edit [<remote>:]<project>"
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
-msgstr "import [<remote>:] <backup file>"
+#: lxc/project.go:332 lxc/project.go:595
+#, fuzzy
+msgid "[<remote>:]<project> <key>"
+msgstr "get [<remote>:]<project> <key>"
 
-#: lxc/storage.go:443
-msgid "info"
-msgstr "ストレージ情報"
+#: lxc/project.go:535
+#, fuzzy
+msgid "[<remote>:]<project> <key>=<value>..."
+msgstr "set [<remote>:]<project> <key>=<value>..."
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
-msgstr "info [<remote>:]<image>"
+#: lxc/project.go:479
+#, fuzzy
+msgid "[<remote>:]<project> <new-name>"
+msgstr "rename [<remote>:]<project> <new-name>"
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
-msgstr "info [<remote>:]<network>"
+#: lxc/copy.go:37
+#, fuzzy
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+msgstr "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
-msgstr "info [<remote>:]<pool>"
+#: lxc/config.go:87 lxc/config.go:608
+#, fuzzy
+msgid "[<remote>:][<instance>[/<snapshot>]]"
+msgstr "edit [<remote>:][<instance>[/<snapshot>]]"
 
 #: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#, fuzzy
+msgid "[<remote>:][<instance>]"
 msgstr "info [<remote>:][<instance>]"
 
+#: lxc/config.go:358 lxc/config.go:732
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>"
+msgstr "get [<remote>:][<instance>] <key>"
+
+#: lxc/config.go:450
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>=<value>..."
+msgstr "set [<remote>:][<instance>] <key>=<value>..."
+
+#: lxc/remote.go:82
+#, fuzzy
+msgid "[<remote>] <IP|FQDN|URL>"
+msgstr "add [<remote>] <IP|FQDN|URL>"
+
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+#, fuzzy
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
-msgstr "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
+msgstr "現在値"
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
-msgstr "list"
+#: lxc/remote.go:510
+msgid "default"
+msgstr "default"
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
-msgstr "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
+msgstr "説明"
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
-msgstr "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
+msgstr "無効"
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
-msgstr "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
+msgstr "ドライバ"
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
-msgstr "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
+msgstr "有効"
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
-msgstr "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
+msgstr "エラー: %v"
 
-#: lxc/config_device.go:270
-#, fuzzy
-msgid "list [<remote>:]<profile>"
-msgstr "edit [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
+msgstr "%s に失効"
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
-msgstr "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
+msgstr "ストレージ情報"
 
 #: lxc/alias.go:56
 msgid ""
@@ -4526,37 +4682,10 @@ msgstr ""
 "    \"default\" プール内のコンテナ \"data\" のファイルシステムプロパティを表"
 "示します。"
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr "manpage <target>"
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr "metadata"
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr "monitor [<remote>:]"
-
-#: lxc/storage_volume.go:1158
-#, fuzzy
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr "move [<pool>/]<volume> [<pool>/]<volume>"
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr "名前"
 
-#: lxc/network.go:31
-msgid "network"
-msgstr "network"
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr "no"
@@ -4565,343 +4694,242 @@ msgstr "no"
 msgid "ok (y/n)?"
 msgstr "ok (y/n)?"
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr "operation"
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr "override [<remote>:]<instance> <device> [key=value...]"
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr "`lxc profile` コマンドを使ってください"
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr "profile"
+#: lxc/storage.go:448
+msgid "space used"
+msgstr "使用量"
 
-#: lxc/project.go:27
-msgid "project"
-msgstr "project"
+#: lxc/info.go:582
+msgid "stateful"
+msgstr "ステートフル"
 
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
+#: lxc/info.go:584
+msgid "stateless"
+msgstr "ステートレス"
 
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
+#: lxc/info.go:574
+#, c-format
+msgid "taken at %s"
+msgstr "%s に取得しました"
 
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
+#: lxc/storage.go:447
+msgid "total space"
+msgstr "総容量"
 
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr "query [<remote>:]<API path>"
+#: lxc/version.go:48
+msgid "unreachable"
+msgstr "サーバに接続できません"
 
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr "refresh [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/storage.go:442
+msgid "used by"
+msgstr "ストレージを使用中の"
 
-#: lxc/remote.go:31
-msgid "remote"
-msgstr "remote"
+#: lxc/remote.go:270
+msgid "y"
+msgstr "y"
 
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr "remove <alias>"
+#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
+#: lxc/image.go:1069
+msgid "yes"
+msgstr "yes"
 
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr "remove <remote>"
+#~ msgid "assign [<remote>:]<instance> <profiles>"
+#~ msgstr "assign [<remote>:]<instance> <profiles>"
 
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr "remove [<remote>:] <hostname|fingerprint>"
+#~ msgid "cluster"
+#~ msgstr "cluster"
 
-#: lxc/config_device.go:423
-#, fuzzy
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr "remove [<remote>:]<instance|profile> <name>..."
+#~ msgid "config"
+#~ msgstr "config"
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr "remove [<remote>:]<instance> <profile>"
+#~ msgid "console [<remote>:]<instance>"
+#~ msgstr "console [<remote>:]<instance>"
 
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr "remove [<remote>:]<member>"
+#~ msgid "create [<remote>:]<instance> <template>"
+#~ msgstr "create [<remote>:]<instance> <template>"
 
-#: lxc/config_device.go:425
-#, fuzzy
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr "remove [<remote>:]<instance|profile> <name>..."
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr "rename <old alias> <new alias>"
+#~ msgid "create [<remote>:]<profile>"
+#~ msgstr "create [<remote>:]<profile>"
 
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr "rename <remote> <new-name>"
+#~ msgid "create [<remote>:]<project>"
+#~ msgstr "create [<remote>:]<project>"
 
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr "rename [<remote>:]<alias> <new-name>"
+#~ msgid "delete [<remote>:]<instance> <template>"
+#~ msgstr "delete [<remote>:]<instance> <template>"
 
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
+#~ msgid "delete [<remote>:]<network>"
+#~ msgstr "delete [<remote>:]<network>"
 
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr "rename [<remote>:]<member> <new-name>"
+#~ msgid "delete [<remote>:]<operation>"
+#~ msgstr "delete [<remote>:]<operation>"
 
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr "rename [<remote>:]<network> <new-name>"
+#~ msgid "delete [<remote>:]<pool>"
+#~ msgstr "delete [<remote>:]<pool>"
 
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
+#~ msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgstr "delete [<remote>:]<pool> <volume>[/<snapshot>]"
 
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr "rename [<remote>:]<profile> <new-name>"
+#~ msgid "delete [<remote>:]<profile>"
+#~ msgstr "delete [<remote>:]<profile>"
 
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr "rename [<remote>:]<project> <new-name>"
+#~ msgid "delete [<remote>:]<project>"
+#~ msgstr "delete [<remote>:]<project>"
 
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgid "device"
+#~ msgstr "device"
 
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr "restore [<remote>:]<instance> <snapshot>"
+#~ msgid "file"
+#~ msgstr "file"
 
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr "restore [<remote>:]<pool> <volume> <snapshot>"
+#~ msgid "get-default"
+#~ msgstr "get-default"
 
-#: lxc/config_device.go:519
-#, fuzzy
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#~ msgid "image"
+#~ msgstr "image"
 
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr "set [<remote>:]<network> <key>=<value>..."
+#~ msgid "info [<remote>:]<image>"
+#~ msgstr "info [<remote>:]<image>"
 
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr "set [<remote>:]<pool> <key> <value>"
+#~ msgid "info [<remote>:]<network>"
+#~ msgstr "info [<remote>:]<network>"
 
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr "set [<remote>:]<pool> <volume> <key>=<value>..."
+#~ msgid "info [<remote>:]<pool>"
+#~ msgstr "info [<remote>:]<pool>"
 
-#: lxc/config_device.go:526
-#, fuzzy
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#~ msgid "list"
+#~ msgstr "list"
 
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr "set [<remote>:]<profile> <key><value>..."
+#~ msgid "list [<remote>:]<instance>"
+#~ msgstr "list [<remote>:]<instance>"
 
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr "set [<remote>:]<project> <key>=<value>..."
+#~ msgid "list [<remote>:]<pool>"
+#~ msgstr "list [<remote>:]<pool>"
 
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr "set [<remote>:][<instance>] <key>=<value>..."
+#, fuzzy
+#~ msgid "list [<remote>:]<profile>"
+#~ msgstr "edit [<remote>:]<profile>"
 
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr "set-url <remote> <URL>"
+#~ msgid "list-leases [<remote>:]<network>"
+#~ msgstr "list-leases [<remote>:]<network>"
 
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr "show [<remote>:]<image>"
+#~ msgid "metadata"
+#~ msgstr "metadata"
 
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr "show [<remote>:]<instance>"
+#~ msgid "monitor [<remote>:]"
+#~ msgstr "monitor [<remote>:]"
 
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr "show [<remote>:]<instance> <template>"
+#~ msgid "network"
+#~ msgstr "network"
 
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr "show [<remote>:]<member>"
+#~ msgid "operation"
+#~ msgstr "operation"
 
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr "show [<remote>:]<network>"
+#~ msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr "show [<remote>:]<operation>"
+#~ msgid "profile"
+#~ msgstr "profile"
 
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr "show [<remote>:]<pool>"
+#~ msgid "project"
+#~ msgstr "project"
 
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr "show [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
+#~ msgstr "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr "show [<remote>:]<profile>"
+#~ msgid "remove <alias>"
+#~ msgstr "remove <alias>"
 
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr "show [<remote>:]<project>"
+#~ msgid "remove <remote>"
+#~ msgstr "remove <remote>"
 
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr "show [<remote>:][<instance>[/<snapshot>]]"
+#~ msgid "remove [<remote>:]<instance> <profile>"
+#~ msgstr "remove [<remote>:]<instance> <profile>"
 
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr "snapshot [<remote>:]<instance> [<snapshot name>]"
+#~ msgid "remove [<remote>:]<member>"
+#~ msgstr "remove [<remote>:]<member>"
 
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
+#~ msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 
-#: lxc/storage.go:448
-msgid "space used"
-msgstr "使用量"
+#~ msgid "show [<remote>:]<image>"
+#~ msgstr "show [<remote>:]<image>"
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgid "show [<remote>:]<instance>"
+#~ msgstr "show [<remote>:]<instance>"
 
-#: lxc/info.go:582
-msgid "stateful"
-msgstr "ステートフル"
+#~ msgid "show [<remote>:]<instance> <template>"
+#~ msgstr "show [<remote>:]<instance> <template>"
 
-#: lxc/info.go:584
-msgid "stateless"
-msgstr "ステートレス"
+#~ msgid "show [<remote>:]<network>"
+#~ msgstr "show [<remote>:]<network>"
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgid "show [<remote>:]<pool>"
+#~ msgstr "show [<remote>:]<pool>"
 
-#: lxc/storage.go:31
-msgid "storage"
-msgstr "storage"
+#~ msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgstr "show [<remote>:]<pool> <volume>[/<snapshot>]"
 
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr "switch <remote>"
+#~ msgid "show [<remote>:]<profile>"
+#~ msgstr "show [<remote>:]<profile>"
 
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr "switch [<remote>:] <project>"
+#~ msgid "show [<remote>:]<project>"
+#~ msgstr "show [<remote>:]<project>"
 
-#: lxc/info.go:574
-#, c-format
-msgid "taken at %s"
-msgstr "%s に取得しました"
-
-#: lxc/config_template.go:26
-msgid "template"
-msgstr "template"
+#~ msgid "show [<remote>:][<instance>[/<snapshot>]]"
+#~ msgstr "show [<remote>:][<instance>[/<snapshot>]]"
 
-#: lxc/storage.go:447
-msgid "total space"
-msgstr "総容量"
+#~ msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
+#~ msgstr "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr "trust"
+#~ msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 
-#: lxc/version.go:48
-msgid "unreachable"
-msgstr "サーバに接続できません"
+#~ msgid "storage"
+#~ msgstr "storage"
 
-#: lxc/config_device.go:698
-#, fuzzy
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr "unset [<remote>:]<instance|profile> <device> <key>"
+#~ msgid "switch <remote>"
+#~ msgstr "switch <remote>"
 
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr "unset [<remote>:]<network> <key>"
+#~ msgid "switch [<remote>:]<project>"
+#~ msgstr "switch [<remote>:] <project>"
 
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr "unset [<remote>:]<pool> <key>"
+#~ msgid "template"
+#~ msgstr "template"
 
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr "unset [<remote>:]<pool> <volume> <key>"
+#~ msgid "trust"
+#~ msgstr "trust"
 
-#: lxc/config_device.go:700
 #, fuzzy
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr "unset [<remote>:]<instance|profile> <device> <key>"
+#~ msgid "unset [<remote>:]<instance> <device> <key>"
+#~ msgstr "unset [<remote>:]<instance|profile> <device> <key>"
 
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr "unset [<remote>:]<profile> <key>"
+#~ msgid "unset [<remote>:]<network> <key>"
+#~ msgstr "unset [<remote>:]<network> <key>"
 
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr "unset [<remote>:]<project> <key>"
+#~ msgid "unset [<remote>:]<pool> <key>"
+#~ msgstr "unset [<remote>:]<pool> <key>"
 
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr "unset [<remote>:][<instance>] <key>"
+#, fuzzy
+#~ msgid "unset [<remote>:]<profile> <device> <key>"
+#~ msgstr "unset [<remote>:]<instance|profile> <device> <key>"
 
-#: lxc/storage.go:442
-msgid "used by"
-msgstr "ストレージを使用中の"
+#~ msgid "unset [<remote>:]<profile> <key>"
+#~ msgstr "unset [<remote>:]<profile> <key>"
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr "version [<remote>:]"
+#~ msgid "unset [<remote>:]<project> <key>"
+#~ msgstr "unset [<remote>:]<project> <key>"
 
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr "volume"
+#~ msgid "unset [<remote>:][<instance>] <key>"
+#~ msgstr "unset [<remote>:][<instance>] <key>"
 
-#: lxc/remote.go:270
-msgid "y"
-msgstr "y"
+#~ msgid "version [<remote>:]"
+#~ msgstr "version [<remote>:]"
 
-#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
-#: lxc/image.go:1069
-msgid "yes"
-msgstr "yes"
+#~ msgid "volume"
+#~ msgstr "volume"
 
 #~ msgid "Add devices to instances or profiles"
 #~ msgstr "インスタンスもしくはプロファイルにデバイスを追加します"
diff --git a/po/ko.po b/po/ko.po
index ad6554b414..8a3650c539 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/lxd.pot b/po/lxd.pot
index 69e82f914b..71e1581246 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2020-09-14 14:06+0100\n"
+        "POT-Creation-Date: 2020-09-15 12:13-0400\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -229,6 +229,50 @@ msgstr  ""
 msgid   "--target cannot be used with instances"
 msgstr  ""
 
+#: lxc/alias.go:192
+msgid   "<alias>"
+msgstr  ""
+
+#: lxc/alias.go:52
+msgid   "<alias> <target>"
+msgstr  ""
+
+#: lxc/alias.go:141
+msgid   "<old alias> <new alias>"
+msgstr  ""
+
+#: lxc/storage_volume.go:1158
+msgid   "<pool>/<volume> <pool>/<volume>"
+msgstr  ""
+
+#: lxc/storage_volume.go:307
+msgid   "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr  ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid   "<remote>"
+msgstr  ""
+
+#: lxc/remote.go:687
+msgid   "<remote> <URL>"
+msgstr  ""
+
+#: lxc/remote.go:536
+msgid   "<remote> <new-name>"
+msgstr  ""
+
+#: lxc/file.go:405
+msgid   "<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr  ""
+
+#: lxc/image.go:610
+msgid   "<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr  ""
+
+#: lxc/manpage.go:18
+msgid   "<target>"
+msgstr  ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid   "ALIAS"
 msgstr  ""
@@ -3210,378 +3254,386 @@ msgstr  ""
 msgid   "You must specify a source instance name"
 msgstr  ""
 
-#: lxc/alias.go:52
-msgid   "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid   "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr  ""
+
+#: lxc/storage_volume.go:221
+msgid   "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr  ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28 lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505 lxc/version.go:20
+msgid   "[<remote>:]"
+msgstr  ""
+
+#: lxc/import.go:26
+msgid   "[<remote>:] <backup file>"
 msgstr  ""
 
 #: lxc/config_trust.go:55
-msgid   "add [<remote>:] <cert>"
+msgid   "[<remote>:] <cert>"
 msgstr  ""
 
-#: lxc/config_device.go:78
-msgid   "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid   "[<remote>:] <hostname|fingerprint>"
 msgstr  ""
 
-#: lxc/profile.go:99
-msgid   "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid   "[<remote>:] <name>"
 msgstr  ""
 
-#: lxc/config_device.go:83
-msgid   "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid   "[<remote>:] [<filter>...]"
 msgstr  ""
 
-#: lxc/remote.go:82
-msgid   "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid   "[<remote>:] [<filters>...]"
 msgstr  ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid   "alias"
+#: lxc/query.go:30
+msgid   "[<remote>:]<API path>"
 msgstr  ""
 
-#: lxc/profile.go:161
-msgid   "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid   "[<remote>:]<alias>"
 msgstr  ""
 
-#: lxc/network.go:107
-msgid   "attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid   "[<remote>:]<alias> <fingerprint>"
 msgstr  ""
 
-#: lxc/storage_volume.go:138
-msgid   "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid   "[<remote>:]<alias> <new-name>"
 msgstr  ""
 
-#: lxc/storage_volume.go:221
-msgid   "attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid   "[<remote>:]<cluster member>"
 msgstr  ""
 
-#: lxc/network.go:180
-msgid   "attach-profile [<remote>:]<network> <profile> [<device name>] [<interface name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid   "[<remote>:]<image>"
 msgstr  ""
 
-#: lxc/cluster.go:29
-msgid   "cluster"
+#: lxc/image.go:126
+msgid   "[<remote>:]<image> <remote>:"
 msgstr  ""
 
-#: lxc/config.go:28
-msgid   "config"
+#: lxc/launch.go:23
+msgid   "[<remote>:]<image> [<remote>:][<name>]"
 msgstr  ""
 
-#: lxc/console.go:34
-msgid   "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid   "[<remote>:]<image> [<target>]"
 msgstr  ""
 
-#: lxc/storage_volume.go:307
-msgid   "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid   "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr  ""
 
-#: lxc/image.go:126
-msgid   "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50 lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid   "[<remote>:]<instance>"
 msgstr  ""
 
-#: lxc/profile.go:241
-msgid   "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid   "[<remote>:]<instance> <device> <key>"
 msgstr  ""
 
-#: lxc/copy.go:37
-msgid   "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid   "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr  ""
 
-#: lxc/image_alias.go:56
-msgid   "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid   "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr  ""
 
-#: lxc/config_template.go:63
-msgid   "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid   "[<remote>:]<instance> <device> [key=value...]"
 msgstr  ""
 
-#: lxc/network.go:253
-msgid   "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid   "[<remote>:]<instance> <name>..."
 msgstr  ""
 
-#: lxc/storage.go:87
-msgid   "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid   "[<remote>:]<instance> <profile>"
 msgstr  ""
 
-#: lxc/storage_volume.go:470
-msgid   "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid   "[<remote>:]<instance> <profiles>"
 msgstr  ""
 
-#: lxc/profile.go:298
-msgid   "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid   "[<remote>:]<instance> <snapshot>"
 msgstr  ""
 
-#: lxc/project.go:84
-msgid   "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105 lxc/config_template.go:148 lxc/config_template.go:293
+msgid   "[<remote>:]<instance> <template>"
 msgstr  ""
 
-#: lxc/project.go:451
-msgid   "current"
+#: lxc/snapshot.go:25
+msgid   "[<remote>:]<instance> [<snapshot name>]"
 msgstr  ""
 
-#: lxc/remote.go:510
-msgid   "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid   "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr  ""
 
-#: lxc/image_alias.go:102
-msgid   "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid   "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr  ""
 
-#: lxc/image.go:274
-msgid   "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid   "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr  ""
 
-#: lxc/config_template.go:105
-msgid   "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid   "[<remote>:]<instance>/<path>"
 msgstr  ""
 
 #: lxc/file.go:102
-msgid   "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid   "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr  ""
 
-#: lxc/delete.go:27
-msgid   "delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
+#: lxc/file.go:215
+msgid   "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr  ""
 
-#: lxc/network.go:326
-msgid   "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid   "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr  ""
 
-#: lxc/operation.go:50
-msgid   "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid   "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr  ""
 
-#: lxc/storage.go:160
-msgid   "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid   "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
-#: lxc/storage_volume.go:548
-msgid   "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid   "[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr  ""
 
-#: lxc/profile.go:351
-msgid   "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid   "[<remote>:]<member>"
 msgstr  ""
 
-#: lxc/project.go:148
-msgid   "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid   "[<remote>:]<member> <new-name>"
 msgstr  ""
 
-#: lxc/storage.go:446
-msgid   "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903 lxc/network.go:1092
+msgid   "[<remote>:]<network>"
 msgstr  ""
 
 #: lxc/network.go:377
-msgid   "detach [<remote>:]<network> <instance> [<device name>]"
-msgstr  ""
-
-#: lxc/storage_volume.go:625
-msgid   "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
+msgid   "[<remote>:]<network> <instance> [<device name>]"
 msgstr  ""
 
-#: lxc/storage_volume.go:707
-msgid   "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid   "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr  ""
 
-#: lxc/network.go:462
-msgid   "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid   "[<remote>:]<network> <key>"
 msgstr  ""
 
-#: lxc/config_device.go:22
-msgid   "device"
+#: lxc/network.go:1022
+msgid   "[<remote>:]<network> <key>=<value>..."
 msgstr  ""
 
-#: lxc/image.go:889
-msgid   "disabled"
+#: lxc/network.go:971
+msgid   "[<remote>:]<network> <new-name>"
 msgstr  ""
 
-#: lxc/storage.go:445
-msgid   "driver"
+#: lxc/network.go:462
+msgid   "[<remote>:]<network> <profile> [<device name>]"
 msgstr  ""
 
-#: lxc/cluster.go:420
-msgid   "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid   "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr  ""
 
-#: lxc/image.go:326
-msgid   "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid   "[<remote>:]<network> [key=value...]"
 msgstr  ""
 
-#: lxc/config_metadata.go:50
-msgid   "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid   "[<remote>:]<operation>"
 msgstr  ""
 
-#: lxc/config_template.go:148
-msgid   "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649 lxc/storage_volume.go:1078
+msgid   "[<remote>:]<pool>"
 msgstr  ""
 
-#: lxc/file.go:152
-msgid   "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid   "[<remote>:]<pool> <driver> [key=value...]"
 msgstr  ""
 
-#: lxc/network.go:547
-msgid   "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid   "[<remote>:]<pool> <key>"
 msgstr  ""
 
-#: lxc/storage.go:211
-msgid   "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid   "[<remote>:]<pool> <key> <value>"
 msgstr  ""
 
-#: lxc/storage_volume.go:788
-msgid   "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid   "[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot name>]"
 msgstr  ""
 
-#: lxc/profile.go:402
-msgid   "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid   "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr  ""
 
-#: lxc/project.go:212
-msgid   "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid   "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr  ""
 
-#: lxc/config.go:87
-msgid   "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid   "[<remote>:]<pool> <volume> <key>"
 msgstr  ""
 
-#: lxc/cluster.go:335
-msgid   "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid   "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr  ""
 
-#: lxc/image.go:891
-msgid   "enabled"
+#: lxc/storage_volume.go:1587
+msgid   "[<remote>:]<pool> <volume> <snapshot>"
 msgstr  ""
 
-#: lxc/action.go:295
-#, c-format
-msgid   "error: %v"
+#: lxc/storage_volume.go:1511
+msgid   "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr  ""
 
-#: lxc/exec.go:38
-msgid   "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid   "[<remote>:]<pool> <volume> [key=value...]"
 msgstr  ""
 
-#: lxc/info.go:578
-#, c-format
-msgid   "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788 lxc/storage_volume.go:1379
+msgid   "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr  ""
 
-#: lxc/image.go:451
-msgid   "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid   "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr  ""
 
-#: lxc/export.go:30
-msgid   "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298 lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid   "[<remote>:]<profile>"
 msgstr  ""
 
-#: lxc/file.go:70
-msgid   "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid   "[<remote>:]<profile> <device> <key>"
 msgstr  ""
 
-#: lxc/config_device.go:188
-msgid   "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid   "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr  ""
 
-#: lxc/network.go:670
-msgid   "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid   "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr  ""
 
-#: lxc/storage.go:331
-msgid   "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid   "[<remote>:]<profile> <key>"
 msgstr  ""
 
-#: lxc/storage_volume.go:988
-msgid   "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid   "[<remote>:]<profile> <key><value>..."
 msgstr  ""
 
-#: lxc/config_device.go:190
-msgid   "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid   "[<remote>:]<profile> <name>..."
 msgstr  ""
 
-#: lxc/profile.go:526
-msgid   "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid   "[<remote>:]<profile> <new-name>"
 msgstr  ""
 
-#: lxc/project.go:332
-msgid   "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid   "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr  ""
 
-#: lxc/config.go:358
-msgid   "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624 lxc/project.go:677
+msgid   "[<remote>:]<project>"
 msgstr  ""
 
-#: lxc/remote.go:421
-msgid   "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid   "[<remote>:]<project> <key>"
 msgstr  ""
 
-#: lxc/image.go:36
-msgid   "image"
+#: lxc/project.go:535
+msgid   "[<remote>:]<project> <key>=<value>..."
 msgstr  ""
 
-#: lxc/image.go:610
-msgid   "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+#: lxc/project.go:479
+msgid   "[<remote>:]<project> <new-name>"
 msgstr  ""
 
-#: lxc/import.go:26
-msgid   "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid   "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr  ""
 
-#: lxc/storage.go:443
-msgid   "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid   "[<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
-#: lxc/image.go:838
-msgid   "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid   "[<remote>:][<instance>]"
 msgstr  ""
 
-#: lxc/network.go:728
-msgid   "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid   "[<remote>:][<instance>] <key>"
 msgstr  ""
 
-#: lxc/storage.go:386
-msgid   "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid   "[<remote>:][<instance>] <key>=<value>..."
 msgstr  ""
 
-#: lxc/info.go:31
-msgid   "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid   "[<remote>] <IP|FQDN|URL>"
 msgstr  ""
 
 #: lxc/init.go:38
-msgid   "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid   "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr  ""
 
-#: lxc/launch.go:23
-msgid   "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid   "current"
 msgstr  ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid   "list"
+#: lxc/remote.go:510
+msgid   "default"
 msgstr  ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid   "list [<remote>:]"
+#: lxc/storage.go:446
+msgid   "description"
 msgstr  ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid   "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid   "disabled"
 msgstr  ""
 
-#: lxc/image_alias.go:147
-msgid   "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid   "driver"
 msgstr  ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid   "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid   "enabled"
 msgstr  ""
 
-#: lxc/storage_volume.go:1078
-msgid   "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid   "error: %v"
 msgstr  ""
 
-#: lxc/config_device.go:270
-msgid   "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid   "expires at %s"
 msgstr  ""
 
-#: lxc/network.go:903
-msgid   "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid   "info"
 msgstr  ""
 
 #: lxc/alias.go:56
@@ -3774,34 +3826,10 @@ msgid   "lxc storage volume show default data\n"
         "    Will show the properties of the filesystem for a container called \"data\" in the \"default\" pool."
 msgstr  ""
 
-#: lxc/manpage.go:18
-msgid   "manpage <target>"
-msgstr  ""
-
-#: lxc/config_metadata.go:25
-msgid   "metadata"
-msgstr  ""
-
-#: lxc/monitor.go:28
-msgid   "monitor [<remote>:]"
-msgstr  ""
-
-#: lxc/storage_volume.go:1158
-msgid   "move <pool>/<volume> <pool>/<volume>"
-msgstr  ""
-
-#: lxc/move.go:33
-msgid   "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr  ""
-
 #: lxc/storage.go:444
 msgid   "name"
 msgstr  ""
 
-#: lxc/network.go:31
-msgid   "network"
-msgstr  ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid   "no"
 msgstr  ""
@@ -3810,226 +3838,14 @@ msgstr  ""
 msgid   "ok (y/n)?"
 msgstr  ""
 
-#: lxc/operation.go:22
-msgid   "operation"
-msgstr  ""
-
-#: lxc/config_device.go:334
-msgid   "override [<remote>:]<instance> <device> [key=value...]"
-msgstr  ""
-
-#: lxc/action.go:48
-msgid   "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr  ""
-
 #: lxc/config.go:53
 msgid   "please use `lxc profile`"
 msgstr  ""
 
-#: lxc/profile.go:27
-msgid   "profile"
-msgstr  ""
-
-#: lxc/project.go:27
-msgid   "project"
-msgstr  ""
-
-#: lxc/publish.go:29
-msgid   "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr  ""
-
-#: lxc/file.go:215
-msgid   "pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
-msgstr  ""
-
-#: lxc/file.go:405
-msgid   "push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
-msgstr  ""
-
-#: lxc/query.go:30
-msgid   "query [<remote>:]<API path>"
-msgstr  ""
-
-#: lxc/image.go:1271
-msgid   "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr  ""
-
-#: lxc/remote.go:31
-msgid   "remote"
-msgstr  ""
-
-#: lxc/alias.go:192
-msgid   "remove <alias>"
-msgstr  ""
-
-#: lxc/remote.go:598
-msgid   "remove <remote>"
-msgstr  ""
-
-#: lxc/config_trust.go:190
-msgid   "remove [<remote>:] <hostname|fingerprint>"
-msgstr  ""
-
-#: lxc/config_device.go:423
-msgid   "remove [<remote>:]<instance> <name>..."
-msgstr  ""
-
-#: lxc/profile.go:634
-msgid   "remove [<remote>:]<instance> <profile>"
-msgstr  ""
-
-#: lxc/cluster.go:251
-msgid   "remove [<remote>:]<member>"
-msgstr  ""
-
-#: lxc/config_device.go:425
-msgid   "remove [<remote>:]<profile> <name>..."
-msgstr  ""
-
-#: lxc/alias.go:141
-msgid   "rename <old alias> <new alias>"
-msgstr  ""
-
-#: lxc/remote.go:536
-msgid   "rename <remote> <new-name>"
-msgstr  ""
-
-#: lxc/image_alias.go:249
-msgid   "rename [<remote>:]<alias> <new-name>"
-msgstr  ""
-
-#: lxc/rename.go:19
-msgid   "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr  ""
-
-#: lxc/cluster.go:201
-msgid   "rename [<remote>:]<member> <new-name>"
-msgstr  ""
-
-#: lxc/network.go:971
-msgid   "rename [<remote>:]<network> <new-name>"
-msgstr  ""
-
-#: lxc/storage_volume.go:1190
-msgid   "rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot name>]"
-msgstr  ""
-
-#: lxc/profile.go:709
-msgid   "rename [<remote>:]<profile> <new-name>"
-msgstr  ""
-
-#: lxc/project.go:479
-msgid   "rename [<remote>:]<project> <new-name>"
-msgstr  ""
-
-#: lxc/action.go:68
-msgid   "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr  ""
-
-#: lxc/restore.go:22
-msgid   "restore [<remote>:]<instance> <snapshot>"
-msgstr  ""
-
-#: lxc/storage_volume.go:1587
-msgid   "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr  ""
-
-#: lxc/config_device.go:519
-msgid   "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr  ""
-
-#: lxc/network.go:1022
-msgid   "set [<remote>:]<network> <key>=<value>..."
-msgstr  ""
-
-#: lxc/storage.go:580
-msgid   "set [<remote>:]<pool> <key> <value>"
-msgstr  ""
-
-#: lxc/storage_volume.go:1303
-msgid   "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr  ""
-
-#: lxc/config_device.go:526
-msgid   "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr  ""
-
-#: lxc/profile.go:760
-msgid   "set [<remote>:]<profile> <key><value>..."
-msgstr  ""
-
-#: lxc/project.go:535
-msgid   "set [<remote>:]<project> <key>=<value>..."
-msgstr  ""
-
-#: lxc/config.go:450
-msgid   "set [<remote>:][<instance>] <key>=<value>..."
-msgstr  ""
-
-#: lxc/remote.go:687
-msgid   "set-url <remote> <URL>"
-msgstr  ""
-
-#: lxc/image.go:1350
-msgid   "show [<remote>:]<image>"
-msgstr  ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid   "show [<remote>:]<instance>"
-msgstr  ""
-
-#: lxc/config_template.go:293
-msgid   "show [<remote>:]<instance> <template>"
-msgstr  ""
-
-#: lxc/cluster.go:152
-msgid   "show [<remote>:]<member>"
-msgstr  ""
-
-#: lxc/network.go:1092
-msgid   "show [<remote>:]<network>"
-msgstr  ""
-
-#: lxc/operation.go:179
-msgid   "show [<remote>:]<operation>"
-msgstr  ""
-
-#: lxc/storage.go:649
-msgid   "show [<remote>:]<pool>"
-msgstr  ""
-
-#: lxc/storage_volume.go:1379
-msgid   "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr  ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid   "show [<remote>:]<profile>"
-msgstr  ""
-
-#: lxc/project.go:624
-msgid   "show [<remote>:]<project>"
-msgstr  ""
-
-#: lxc/config.go:608
-msgid   "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr  ""
-
-#: lxc/snapshot.go:25
-msgid   "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr  ""
-
-#: lxc/storage_volume.go:1511
-msgid   "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr  ""
-
 #: lxc/storage.go:448
 msgid   "space used"
 msgstr  ""
 
-#: lxc/action.go:29
-msgid   "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr  ""
-
 #: lxc/info.go:582
 msgid   "stateful"
 msgstr  ""
@@ -4038,87 +3854,23 @@ msgstr  ""
 msgid   "stateless"
 msgstr  ""
 
-#: lxc/action.go:89
-msgid   "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr  ""
-
-#: lxc/storage.go:31
-msgid   "storage"
-msgstr  ""
-
-#: lxc/remote.go:649
-msgid   "switch <remote>"
-msgstr  ""
-
-#: lxc/project.go:677
-msgid   "switch [<remote>:]<project>"
-msgstr  ""
-
 #: lxc/info.go:574
 #, c-format
 msgid   "taken at %s"
 msgstr  ""
 
-#: lxc/config_template.go:26
-msgid   "template"
-msgstr  ""
-
 #: lxc/storage.go:447
 msgid   "total space"
 msgstr  ""
 
-#: lxc/config_trust.go:26
-msgid   "trust"
-msgstr  ""
-
 #: lxc/version.go:48
 msgid   "unreachable"
 msgstr  ""
 
-#: lxc/config_device.go:698
-msgid   "unset [<remote>:]<instance> <device> <key>"
-msgstr  ""
-
-#: lxc/network.go:1154
-msgid   "unset [<remote>:]<network> <key>"
-msgstr  ""
-
-#: lxc/storage.go:733
-msgid   "unset [<remote>:]<pool> <key>"
-msgstr  ""
-
-#: lxc/storage_volume.go:1478
-msgid   "unset [<remote>:]<pool> <volume> <key>"
-msgstr  ""
-
-#: lxc/config_device.go:700
-msgid   "unset [<remote>:]<profile> <device> <key>"
-msgstr  ""
-
-#: lxc/profile.go:873
-msgid   "unset [<remote>:]<profile> <key>"
-msgstr  ""
-
-#: lxc/project.go:595
-msgid   "unset [<remote>:]<project> <key>"
-msgstr  ""
-
-#: lxc/config.go:732
-msgid   "unset [<remote>:][<instance>] <key>"
-msgstr  ""
-
 #: lxc/storage.go:442
 msgid   "used by"
 msgstr  ""
 
-#: lxc/version.go:20
-msgid   "version [<remote>:]"
-msgstr  ""
-
-#: lxc/storage_volume.go:31
-msgid   "volume"
-msgstr  ""
-
 #: lxc/remote.go:270
 msgid   "y"
 msgstr  ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index c93a0c8497..1e54a89798 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 3cef9983d0..7a2c784e77 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -356,6 +356,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
@@ -3509,388 +3555,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4122,35 +4179,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4159,233 +4191,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4394,87 +4207,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 3f67654814..552df02ae5 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index b8b4e8eaa0..f6c194179b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2018-09-08 19:22+0000\n"
 "Last-Translator: m4sk1n <me at m4sk.in>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/linux-containers/"
@@ -366,6 +366,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3519,388 +3565,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4132,35 +4189,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4169,233 +4201,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4404,87 +4217,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b069084f76..4e2c572bf2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -372,6 +372,52 @@ msgstr "--refresh só pode ser usado com containers"
 msgid "--target cannot be used with instances"
 msgstr "--refresh só pode ser usado com containers"
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
@@ -3598,388 +3644,403 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/config_trust.go:55
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/restore.go:22
+#, fuzzy
+msgid "[<remote>:]<instance> <snapshot>"
+msgstr "Apagar nomes alternativos da imagem"
+
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+#, fuzzy
+msgid "[<remote>:]<instance> <template>"
+msgstr "Editar templates de arquivo do container"
+
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr ""
+
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
-msgstr ""
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+#, fuzzy
+msgid "[<remote>:]<profile>"
+msgstr "Criar perfis"
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
-msgstr ""
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+#, fuzzy
+msgid "[<remote>:]<project>"
+msgstr "Criar projetos"
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4211,35 +4272,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4248,233 +4284,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4483,87 +4300,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 72132b87b0..f85869d84b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: 2020-08-02 01:42+0000\n"
 "Last-Translator: Anthony <aemeltsev at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -367,6 +367,65 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+#, fuzzy
+msgid "<alias>"
+msgstr "Псевдонимы:"
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+#, fuzzy
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/storage_volume.go:307
+#, fuzzy
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+#, fuzzy
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ПСЕВДОНИМ"
@@ -3589,625 +3648,851 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
-msgstr ""
-
-#: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
-msgstr ""
-
-#: lxc/config_device.go:78
+#: lxc/storage_volume.go:707
 #, fuzzy
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:99
+#: lxc/storage_volume.go:221
 #, fuzzy
-msgid "add [<remote>:]<instance> <profile>"
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:83
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
 #, fuzzy
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+msgid "[<remote>:]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
-msgstr ""
-
-#: lxc/alias.go:20 lxc/image_alias.go:23
+#: lxc/import.go:26
 #, fuzzy
-msgid "alias"
-msgstr "Псевдонимы:"
-
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
-msgstr ""
-
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+msgid "[<remote>:] <backup file>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:138
+#: lxc/config_trust.go:55
 #, fuzzy
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
-msgstr ""
-
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
-msgstr ""
-
-#: lxc/cluster.go:29
-msgid "cluster"
-msgstr ""
-
-#: lxc/config.go:28
-msgid "config"
-msgstr ""
-
-#: lxc/console.go:34
+#: lxc/config_trust.go:190
 #, fuzzy
-msgid "console [<remote>:]<instance>"
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
-msgstr ""
-
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
-msgstr ""
-
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
-msgstr ""
-
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
-msgstr ""
-
-#: lxc/config_template.go:63
+#: lxc/cluster.go:335
 #, fuzzy
-msgid "create [<remote>:]<instance> <template>"
+msgid "[<remote>:] <name>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
-msgstr ""
-
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
-msgstr ""
-
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
-msgstr ""
-
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/image.go:972 lxc/list.go:42
+#, fuzzy
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/image_alias.go:147
+#, fuzzy
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/query.go:30
+#, fuzzy
+msgid "[<remote>:]<API path>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
-msgstr ""
-
-#: lxc/image.go:274
 #, fuzzy
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgid "[<remote>:]<alias>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_template.go:105
+#: lxc/image_alias.go:56
 #, fuzzy
-msgid "delete [<remote>:]<instance> <template>"
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:102
+#: lxc/image_alias.go:249
 #, fuzzy
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/delete.go:27
+#: lxc/cluster.go:420
 #, fuzzy
-msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:548
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
 #, fuzzy
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+msgid "[<remote>:]<image>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:148
+#: lxc/image.go:126
 #, fuzzy
-msgid "delete [<remote>:]<project>"
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage.go:446
-msgid "description"
-msgstr ""
-
-#: lxc/network.go:377
+#: lxc/launch.go:23
 #, fuzzy
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:625
+#: lxc/image.go:451
 #, fuzzy
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
-msgstr ""
-
-#: lxc/network.go:462
+#: lxc/image.go:274 lxc/image.go:1271
 #, fuzzy
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:22
-msgid "device"
-msgstr ""
-
-#: lxc/image.go:889
-msgid "disabled"
-msgstr ""
-
-#: lxc/storage.go:445
-msgid "driver"
-msgstr ""
-
-#: lxc/cluster.go:420
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
 #, fuzzy
-msgid "edit [<remote>:]<cluster member>"
+msgid "[<remote>:]<instance>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_metadata.go:50
+#: lxc/config_device.go:188 lxc/config_device.go:698
 #, fuzzy
-msgid "edit [<remote>:]<instance>"
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_template.go:148
+#: lxc/config_device.go:519
 #, fuzzy
-msgid "edit [<remote>:]<instance> <template>"
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:152
+#: lxc/config_device.go:78
 #, fuzzy
-msgid "edit [<remote>:]<instance>/<path>"
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
-msgstr ""
-
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/config_device.go:334
+#, fuzzy
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:788
+#: lxc/config_device.go:423
 #, fuzzy
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/profile.go:99 lxc/profile.go:634
+#, fuzzy
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/profile.go:161
+#, fuzzy
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:87
+#: lxc/restore.go:22
 #, fuzzy
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+#, fuzzy
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/snapshot.go:25
+#, fuzzy
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+#, fuzzy
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
-msgstr ""
-
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
-msgstr ""
-
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#, fuzzy
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/export.go:30
 #, fuzzy
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/file.go:152
+#, fuzzy
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:188
+#: lxc/file.go:102
 #, fuzzy
-msgid "get [<remote>:]<instance> <device> <key>"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/file.go:215
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/rename.go:19
+#, fuzzy
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:988
+#: lxc/publish.go:29
 #, fuzzy
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:190
+#: lxc/move.go:33
 #, fuzzy
-msgid "get [<remote>:]<profile> <device> <key>"
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/delete.go:27
+#, fuzzy
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/project.go:332
+#: lxc/cluster.go:152 lxc/cluster.go:251
 #, fuzzy
-msgid "get [<remote>:]<project> <key>"
+msgid "[<remote>:]<member>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:358
+#: lxc/cluster.go:201
 #, fuzzy
-msgid "get [<remote>:][<instance>] <key>"
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:421
-msgid "get-default"
-msgstr ""
-
-#: lxc/image.go:36
-msgid "image"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+#, fuzzy
+msgid "[<remote>:]<network>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/network.go:377
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/network.go:107
+#, fuzzy
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/network.go:670 lxc/network.go:1154
+#, fuzzy
+msgid "[<remote>:]<network> <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/network.go:1022
+#, fuzzy
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/network.go:971
+#, fuzzy
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/network.go:462
+#, fuzzy
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/info.go:31
+#: lxc/network.go:180
 #, fuzzy
-msgid "info [<remote>:][<instance>]"
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/init.go:38
+#: lxc/network.go:253
 #, fuzzy
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/operation.go:50 lxc/operation.go:179
+#, fuzzy
+msgid "[<remote>:]<operation>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+#, fuzzy
+msgid "[<remote>:]<pool>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:87
+#, fuzzy
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/storage.go:331 lxc/storage.go:733
+#, fuzzy
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:580
+#, fuzzy
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
+#: lxc/storage_volume.go:1190
 #, fuzzy
-msgid "list [<remote>:]<instance>"
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/storage_volume.go:625
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:270
+#: lxc/storage_volume.go:138
 #, fuzzy
-msgid "list [<remote>:]<profile>"
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage_volume.go:1478
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/alias.go:56
-msgid ""
-"lxc alias add list \"list -c ns46S\"\n"
-"    Overwrite the \"list\" command to pass -c ns46S."
+#: lxc/storage_volume.go:1303
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/alias.go:197
-msgid ""
-"lxc alias remove my-list\n"
-"    Remove the \"my-list\" alias."
+#: lxc/storage_volume.go:1587
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/alias.go:146
-msgid ""
-"lxc alias rename list my-list\n"
-"    Rename existing alias \"list\" to \"my-list\"."
+#: lxc/storage_volume.go:1511
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:424
-msgid ""
-"lxc cluster edit <cluster member> < member.yaml\n"
-"    Update a cluster member using the content of member.yaml"
+#: lxc/storage_volume.go:470
+#, fuzzy
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:79
-msgid ""
-"lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
-"c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the instance."
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:91
-msgid ""
-"lxc config edit <instance> < instance.yaml\n"
-"    Update the instance configuration from config.yaml."
+#: lxc/storage_volume.go:988
+#, fuzzy
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
-
-#: lxc/config.go:457
-msgid ""
-"lxc config set [<remote>:]<instance> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the instance.\n"
-"\n"
-"lxc config set core.https_address=[::]:8443\n"
-"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
-"lxc config set core.trust_password=blah\n"
-"    Will set the server's trust password to blah."
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+#, fuzzy
+msgid "[<remote>:]<profile>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/export.go:34
-msgid ""
-"lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 instance."
+#: lxc/config_device.go:190 lxc/config_device.go:700
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:219
-msgid ""
-"lxc file pull foo/etc/hosts .\n"
-"   To pull /etc/hosts from the instance and write it to the current "
-"directory."
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:409
-msgid ""
-"lxc file push /etc/hosts foo/etc/hosts\n"
-"   To push /etc/hosts into the instance \"foo\"."
+#: lxc/config_device.go:83
+#, fuzzy
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:330
-msgid ""
-"lxc image edit <image>\n"
-"    Launch a text editor to edit the properties\n"
+#: lxc/profile.go:526 lxc/profile.go:873
+#, fuzzy
+msgid "[<remote>:]<profile> <key>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
-"lxc image edit <image> < image.yaml\n"
-"    Load the image properties from a YAML file"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/profile.go:760
+#, fuzzy
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/import.go:30
-msgid ""
-"lxc import backup0.tar.gz\n"
-"    Create a new instance using backup0.tar.gz as the source."
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/info.go:35
-msgid ""
-"lxc info [<remote>:]<instance> [--show-log]\n"
-"    For instance information.\n"
+#: lxc/profile.go:709
+#, fuzzy
+msgid "[<remote>:]<profile> <new-name>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
-"lxc info [<remote>:] [--resources]\n"
-"    For LXD server information."
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/profile.go:241
+#, fuzzy
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/init.go:41
-msgid ""
-"lxc init ubuntu:18.04 u1\n"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+#, fuzzy
+msgid "[<remote>:]<project>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
-"lxc init ubuntu:18.04 u1 < config.yaml\n"
-"    Create the instance with configuration from config.yaml"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/project.go:332 lxc/project.go:595
+#, fuzzy
+msgid "[<remote>:]<project> <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/launch.go:27
-msgid ""
-"lxc launch ubuntu:18.04 u1\n"
+#: lxc/project.go:535
+#, fuzzy
+msgid "[<remote>:]<project> <key>=<value>..."
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
-"lxc launch ubuntu:18.04 u1 < config.yaml\n"
-"    Create and start the instance with configuration from config.yaml"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/project.go:479
+#, fuzzy
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/list.go:107
-msgid ""
+#: lxc/copy.go:37
+#, fuzzy
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/config.go:87 lxc/config.go:608
+#, fuzzy
+msgid "[<remote>:][<instance>[/<snapshot>]]"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/info.go:31
+#, fuzzy
+msgid "[<remote>:][<instance>]"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/config.go:358 lxc/config.go:732
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/config.go:450
+#, fuzzy
+msgid "[<remote>:][<instance>] <key>=<value>..."
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
+msgstr ""
+
+#: lxc/init.go:38
+#, fuzzy
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/project.go:451
+msgid "current"
+msgstr ""
+
+#: lxc/remote.go:510
+msgid "default"
+msgstr ""
+
+#: lxc/storage.go:446
+msgid "description"
+msgstr ""
+
+#: lxc/image.go:889
+msgid "disabled"
+msgstr ""
+
+#: lxc/storage.go:445
+msgid "driver"
+msgstr ""
+
+#: lxc/image.go:891
+msgid "enabled"
+msgstr ""
+
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
+msgstr ""
+
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
+msgstr ""
+
+#: lxc/storage.go:443
+msgid "info"
+msgstr ""
+
+#: lxc/alias.go:56
+msgid ""
+"lxc alias add list \"list -c ns46S\"\n"
+"    Overwrite the \"list\" command to pass -c ns46S."
+msgstr ""
+
+#: lxc/alias.go:197
+msgid ""
+"lxc alias remove my-list\n"
+"    Remove the \"my-list\" alias."
+msgstr ""
+
+#: lxc/alias.go:146
+msgid ""
+"lxc alias rename list my-list\n"
+"    Rename existing alias \"list\" to \"my-list\"."
+msgstr ""
+
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
+#: lxc/config_device.go:79
+msgid ""
+"lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the instance."
+msgstr ""
+
+#: lxc/config.go:91
+msgid ""
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
+msgstr ""
+
+#: lxc/config.go:457
+msgid ""
+"lxc config set [<remote>:]<instance> limits.cpu=2\n"
+"    Will set a CPU limit of \"2\" for the instance.\n"
+"\n"
+"lxc config set core.https_address=[::]:8443\n"
+"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"\n"
+"lxc config set core.trust_password=blah\n"
+"    Will set the server's trust password to blah."
+msgstr ""
+
+#: lxc/export.go:34
+msgid ""
+"lxc export u1 backup0.tar.gz\n"
+"    Download a backup tarball of the u1 instance."
+msgstr ""
+
+#: lxc/file.go:219
+msgid ""
+"lxc file pull foo/etc/hosts .\n"
+"   To pull /etc/hosts from the instance and write it to the current "
+"directory."
+msgstr ""
+
+#: lxc/file.go:409
+msgid ""
+"lxc file push /etc/hosts foo/etc/hosts\n"
+"   To push /etc/hosts into the instance \"foo\"."
+msgstr ""
+
+#: lxc/image.go:330
+msgid ""
+"lxc image edit <image>\n"
+"    Launch a text editor to edit the properties\n"
+"\n"
+"lxc image edit <image> < image.yaml\n"
+"    Load the image properties from a YAML file"
+msgstr ""
+
+#: lxc/import.go:30
+msgid ""
+"lxc import backup0.tar.gz\n"
+"    Create a new instance using backup0.tar.gz as the source."
+msgstr ""
+
+#: lxc/info.go:35
+msgid ""
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
+"\n"
+"lxc info [<remote>:] [--resources]\n"
+"    For LXD server information."
+msgstr ""
+
+#: lxc/init.go:41
+msgid ""
+"lxc init ubuntu:18.04 u1\n"
+"\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
+"    Create the instance with configuration from config.yaml"
+msgstr ""
+
+#: lxc/launch.go:27
+msgid ""
+"lxc launch ubuntu:18.04 u1\n"
+"\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
+"    Create and start the instance with configuration from config.yaml"
+msgstr ""
+
+#: lxc/list.go:107
+msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
 "  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
@@ -4327,43 +4612,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-#, fuzzy
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/move.go:33
-#, fuzzy
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4372,475 +4624,192 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
+#: lxc/config.go:53
+msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/config_device.go:334
-#, fuzzy
-msgid "override [<remote>:]<instance> <device> [key=value...]"
+#: lxc/storage.go:448
+msgid "space used"
 msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/action.go:48
-#, fuzzy
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+#: lxc/info.go:582
+msgid "stateful"
 msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:53
-msgid "please use `lxc profile`"
+#: lxc/info.go:584
+msgid "stateless"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
+#: lxc/info.go:574
+#, c-format
+msgid "taken at %s"
 msgstr ""
 
-#: lxc/project.go:27
-msgid "project"
+#: lxc/storage.go:447
+msgid "total space"
 msgstr ""
 
-#: lxc/publish.go:29
-#, fuzzy
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
+#: lxc/version.go:48
+msgid "unreachable"
 msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:215
-#, fuzzy
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
+#: lxc/storage.go:442
+msgid "used by"
 msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:405
-#, fuzzy
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-#, fuzzy
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-#, fuzzy
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/profile.go:634
-#, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-#, fuzzy
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-#, fuzzy
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-#, fuzzy
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-#, fuzzy
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/restore.go:22
-#, fuzzy
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/storage_volume.go:1587
-#, fuzzy
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/config_device.go:519
-#, fuzzy
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/network.go:1022
-#, fuzzy
-msgid "set [<remote>:]<network> <key>=<value>..."
+#: lxc/remote.go:270
+msgid "y"
 msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
+#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
+#: lxc/image.go:1069
+msgid "yes"
+msgstr "да"
 
-#: lxc/storage_volume.go:1303
 #, fuzzy
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "console [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:526
 #, fuzzy
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "create [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:760
 #, fuzzy
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "delete [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/project.go:535
 #, fuzzy
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:450
 #, fuzzy
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
+#~ msgid "list [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
 #, fuzzy
-msgid "show [<remote>:]<instance>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_template.go:293
 #, fuzzy
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
+#~ msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1379
 #, fuzzy
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
+#~ msgid "remove [<remote>:]<instance> <profile>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:608
 #, fuzzy
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/snapshot.go:25
 #, fuzzy
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "show [<remote>:]<instance>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1511
 #, fuzzy
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/storage.go:448
-msgid "space used"
-msgstr ""
+#~ msgid "show [<remote>:]<instance> <template>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/action.go:29
 #, fuzzy
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/info.go:582
-msgid "stateful"
-msgstr ""
-
-#: lxc/info.go:584
-msgid "stateless"
-msgstr ""
+#~ msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/action.go:89
 #, fuzzy
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
+#~ msgid "show [<remote>:][<instance>[/<snapshot>]]"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/project.go:677
 #, fuzzy
-msgid "switch [<remote>:]<project>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/info.go:574
-#, c-format
-msgid "taken at %s"
-msgstr ""
-
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
-#: lxc/storage.go:447
-msgid "total space"
-msgstr ""
-
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
-#: lxc/version.go:48
-msgid "unreachable"
-msgstr ""
+#~ msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:698
 #, fuzzy
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
+#~ msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:700
 #, fuzzy
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
+#~ msgid "switch [<remote>:]<project>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/project.go:595
 #, fuzzy
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+#~ msgid "unset [<remote>:]<instance> <device> <key>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config.go:732
 #, fuzzy
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/storage.go:442
-msgid "used by"
-msgstr ""
-
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
+#~ msgid "unset [<remote>:]<profile> <device> <key>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:31
 #, fuzzy
-msgid "volume"
-msgstr "Столбцы"
-
-#: lxc/remote.go:270
-msgid "y"
-msgstr ""
-
-#: lxc/cluster.go:284 lxc/delete.go:46 lxc/image.go:881 lxc/image.go:886
-#: lxc/image.go:1069
-msgid "yes"
-msgstr "да"
+#~ msgid "unset [<remote>:]<project> <key>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #, fuzzy
-#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgid "unset [<remote>:][<instance>] <key>"
 #~ msgstr ""
 #~ "Изменение состояния одного или нескольких контейнеров %s.\n"
 #~ "\n"
 #~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
+#, fuzzy
+#~ msgid "volume"
+#~ msgstr "Столбцы"
+
 #~ msgid "ARCH"
 #~ msgstr "ARCH"
 
diff --git a/po/sl.po b/po/sl.po
index fa20459cae..116887c6f8 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 9f7ab736a3..c6ad42f79a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_device.go:526
-msgid "set [<remote>:]<profile> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/profile.go:760
-msgid "set [<remote>:]<profile> <key><value>..."
-msgstr ""
-
-#: lxc/project.go:535
-msgid "set [<remote>:]<project> <key>=<value>..."
-msgstr ""
-
-#: lxc/config.go:450
-msgid "set [<remote>:][<instance>] <key>=<value>..."
-msgstr ""
-
-#: lxc/remote.go:687
-msgid "set-url <remote> <URL>"
-msgstr ""
-
-#: lxc/image.go:1350
-msgid "show [<remote>:]<image>"
-msgstr ""
-
-#: lxc/config_device.go:626 lxc/config_metadata.go:172
-msgid "show [<remote>:]<instance>"
-msgstr ""
-
-#: lxc/config_template.go:293
-msgid "show [<remote>:]<instance> <template>"
-msgstr ""
-
-#: lxc/cluster.go:152
-msgid "show [<remote>:]<member>"
-msgstr ""
-
-#: lxc/network.go:1092
-msgid "show [<remote>:]<network>"
-msgstr ""
-
-#: lxc/operation.go:179
-msgid "show [<remote>:]<operation>"
-msgstr ""
-
-#: lxc/storage.go:649
-msgid "show [<remote>:]<pool>"
-msgstr ""
-
-#: lxc/storage_volume.go:1379
-msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
-msgstr ""
-
-#: lxc/config_device.go:628 lxc/profile.go:819
-msgid "show [<remote>:]<profile>"
-msgstr ""
-
-#: lxc/project.go:624
-msgid "show [<remote>:]<project>"
-msgstr ""
-
-#: lxc/config.go:608
-msgid "show [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
-#: lxc/snapshot.go:25
-msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:1511
-msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
-msgstr ""
-
 #: lxc/storage.go:448
 msgid "space used"
 msgstr ""
 
-#: lxc/action.go:29
-msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/info.go:582
 msgid "stateful"
 msgstr ""
@@ -4277,87 +4090,23 @@ msgstr ""
 msgid "stateless"
 msgstr ""
 
-#: lxc/action.go:89
-msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/storage.go:31
-msgid "storage"
-msgstr ""
-
-#: lxc/remote.go:649
-msgid "switch <remote>"
-msgstr ""
-
-#: lxc/project.go:677
-msgid "switch [<remote>:]<project>"
-msgstr ""
-
 #: lxc/info.go:574
 #, c-format
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:26
-msgid "template"
-msgstr ""
-
 #: lxc/storage.go:447
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:26
-msgid "trust"
-msgstr ""
-
 #: lxc/version.go:48
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:698
-msgid "unset [<remote>:]<instance> <device> <key>"
-msgstr ""
-
-#: lxc/network.go:1154
-msgid "unset [<remote>:]<network> <key>"
-msgstr ""
-
-#: lxc/storage.go:733
-msgid "unset [<remote>:]<pool> <key>"
-msgstr ""
-
-#: lxc/storage_volume.go:1478
-msgid "unset [<remote>:]<pool> <volume> <key>"
-msgstr ""
-
-#: lxc/config_device.go:700
-msgid "unset [<remote>:]<profile> <device> <key>"
-msgstr ""
-
-#: lxc/profile.go:873
-msgid "unset [<remote>:]<profile> <key>"
-msgstr ""
-
-#: lxc/project.go:595
-msgid "unset [<remote>:]<project> <key>"
-msgstr ""
-
-#: lxc/config.go:732
-msgid "unset [<remote>:][<instance>] <key>"
-msgstr ""
-
 #: lxc/storage.go:442
 msgid "used by"
 msgstr ""
 
-#: lxc/version.go:20
-msgid "version [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:31
-msgid "volume"
-msgstr ""
-
 #: lxc/remote.go:270
 msgid "y"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index c089d2af25..beabf61a4b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-09-14 14:06+0100\n"
+"POT-Creation-Date: 2020-09-15 12:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,6 +239,52 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
+#: lxc/alias.go:192
+msgid "<alias>"
+msgstr ""
+
+#: lxc/alias.go:52
+msgid "<alias> <target>"
+msgstr ""
+
+#: lxc/alias.go:141
+msgid "<old alias> <new alias>"
+msgstr ""
+
+#: lxc/storage_volume.go:1158
+msgid "<pool>/<volume> <pool>/<volume>"
+msgstr ""
+
+#: lxc/storage_volume.go:307
+msgid "<pool>/<volume>[/<snapshot>] <pool>/<volume>"
+msgstr ""
+
+#: lxc/remote.go:598 lxc/remote.go:649
+msgid "<remote>"
+msgstr ""
+
+#: lxc/remote.go:687
+msgid "<remote> <URL>"
+msgstr ""
+
+#: lxc/remote.go:536
+msgid "<remote> <new-name>"
+msgstr ""
+
+#: lxc/file.go:405
+msgid ""
+"<source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgstr ""
+
+#: lxc/image.go:610
+msgid ""
+"<tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
+msgstr ""
+
+#: lxc/manpage.go:18
+msgid "<target>"
+msgstr ""
+
 #: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
@@ -3392,388 +3438,399 @@ msgstr ""
 msgid "You must specify a source instance name"
 msgstr ""
 
-#: lxc/alias.go:52
-msgid "add <alias> <target>"
+#: lxc/storage_volume.go:707
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>]"
+msgstr ""
+
+#: lxc/storage_volume.go:221
+msgid "[<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+msgstr ""
+
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/monitor.go:28
+#: lxc/network.go:807 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381
+#: lxc/storage.go:505 lxc/version.go:20
+msgid "[<remote>:]"
+msgstr ""
+
+#: lxc/import.go:26
+msgid "[<remote>:] <backup file>"
 msgstr ""
 
 #: lxc/config_trust.go:55
-msgid "add [<remote>:] <cert>"
+msgid "[<remote>:] <cert>"
 msgstr ""
 
-#: lxc/config_device.go:78
-msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+#: lxc/config_trust.go:190
+msgid "[<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:99
-msgid "add [<remote>:]<instance> <profile>"
+#: lxc/cluster.go:335
+msgid "[<remote>:] <name>"
 msgstr ""
 
-#: lxc/config_device.go:83
-msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
+#: lxc/image.go:972 lxc/list.go:42
+msgid "[<remote>:] [<filter>...]"
 msgstr ""
 
-#: lxc/remote.go:82
-msgid "add [<remote>] <IP|FQDN|URL>"
+#: lxc/image_alias.go:147
+msgid "[<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/alias.go:20 lxc/image_alias.go:23
-msgid "alias"
+#: lxc/query.go:30
+msgid "[<remote>:]<API path>"
 msgstr ""
 
-#: lxc/profile.go:161
-msgid "assign [<remote>:]<instance> <profiles>"
+#: lxc/image_alias.go:102
+msgid "[<remote>:]<alias>"
 msgstr ""
 
-#: lxc/network.go:107
-msgid ""
-"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
+#: lxc/image_alias.go:56
+msgid "[<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/storage_volume.go:138
-msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+#: lxc/image_alias.go:249
+msgid "[<remote>:]<alias> <new-name>"
 msgstr ""
 
-#: lxc/storage_volume.go:221
-msgid ""
-"attach-profile [<remote:>]<pool> <volume> <profile> [<device name>] <path>"
+#: lxc/cluster.go:420
+msgid "[<remote>:]<cluster member>"
 msgstr ""
 
-#: lxc/network.go:180
-msgid ""
-"attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
-"name>]"
+#: lxc/image.go:326 lxc/image.go:838 lxc/image.go:1350
+msgid "[<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:29
-msgid "cluster"
+#: lxc/image.go:126
+msgid "[<remote>:]<image> <remote>:"
 msgstr ""
 
-#: lxc/config.go:28
-msgid "config"
+#: lxc/launch.go:23
+msgid "[<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/console.go:34
-msgid "console [<remote>:]<instance>"
+#: lxc/image.go:451
+msgid "[<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/storage_volume.go:307
-msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
+#: lxc/image.go:274 lxc/image.go:1271
+msgid "[<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/image.go:126
-msgid "copy [<remote>:]<image> <remote>:"
+#: lxc/config_device.go:268 lxc/config_device.go:626 lxc/config_metadata.go:50
+#: lxc/config_metadata.go:172 lxc/config_template.go:234 lxc/console.go:34
+msgid "[<remote>:]<instance>"
 msgstr ""
 
-#: lxc/profile.go:241
-msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
+#: lxc/config_device.go:188 lxc/config_device.go:698
+msgid "[<remote>:]<instance> <device> <key>"
 msgstr ""
 
-#: lxc/copy.go:37
-msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
+#: lxc/config_device.go:519
+msgid "[<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/image_alias.go:56
-msgid "create [<remote>:]<alias> <fingerprint>"
+#: lxc/config_device.go:78
+msgid "[<remote>:]<instance> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/config_template.go:63
-msgid "create [<remote>:]<instance> <template>"
+#: lxc/config_device.go:334
+msgid "[<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:253
-msgid "create [<remote>:]<network> [key=value...]"
+#: lxc/config_device.go:423
+msgid "[<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/storage.go:87
-msgid "create [<remote>:]<pool> <driver> [key=value...]"
+#: lxc/profile.go:99 lxc/profile.go:634
+msgid "[<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/storage_volume.go:470
-msgid "create [<remote>:]<pool> <volume> [key=value...]"
+#: lxc/profile.go:161
+msgid "[<remote>:]<instance> <profiles>"
 msgstr ""
 
-#: lxc/profile.go:298
-msgid "create [<remote>:]<profile>"
+#: lxc/restore.go:22
+msgid "[<remote>:]<instance> <snapshot>"
 msgstr ""
 
-#: lxc/project.go:84
-msgid "create [<remote>:]<project>"
+#: lxc/config_template.go:63 lxc/config_template.go:105
+#: lxc/config_template.go:148 lxc/config_template.go:293
+msgid "[<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/project.go:451
-msgid "current"
+#: lxc/snapshot.go:25
+msgid "[<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
-#: lxc/remote.go:510
-msgid "default"
+#: lxc/action.go:29 lxc/action.go:48 lxc/action.go:68 lxc/action.go:89
+msgid "[<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/image_alias.go:102
-msgid "delete [<remote>:]<alias>"
+#: lxc/exec.go:38
+msgid "[<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/image.go:274
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+#: lxc/export.go:30
+msgid "[<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 
-#: lxc/config_template.go:105
-msgid "delete [<remote>:]<instance> <template>"
+#: lxc/file.go:152
+msgid "[<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
+msgid "[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
-#: lxc/delete.go:27
+#: lxc/file.go:215
 msgid ""
-"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
-"<snapshot>]...]"
+"[<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr ""
 
-#: lxc/network.go:326
-msgid "delete [<remote>:]<network>"
+#: lxc/rename.go:19
+msgid "[<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/operation.go:50
-msgid "delete [<remote>:]<operation>"
+#: lxc/publish.go:29
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:160
-msgid "delete [<remote>:]<pool>"
+#: lxc/move.go:33
+msgid "[<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/storage_volume.go:548
-msgid "delete [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/delete.go:27
+msgid ""
+"[<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr ""
 
-#: lxc/profile.go:351
-msgid "delete [<remote>:]<profile>"
+#: lxc/cluster.go:152 lxc/cluster.go:251
+msgid "[<remote>:]<member>"
 msgstr ""
 
-#: lxc/project.go:148
-msgid "delete [<remote>:]<project>"
+#: lxc/cluster.go:201
+msgid "[<remote>:]<member> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:446
-msgid "description"
+#: lxc/network.go:326 lxc/network.go:547 lxc/network.go:728 lxc/network.go:903
+#: lxc/network.go:1092
+msgid "[<remote>:]<network>"
 msgstr ""
 
 #: lxc/network.go:377
-msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgid "[<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/storage_volume.go:625
-msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
-msgstr ""
-
-#: lxc/storage_volume.go:707
-msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
+#: lxc/network.go:107
+msgid "[<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/network.go:462
-msgid "detach-profile [<remote>:]<network> <profile> [<device name>]"
+#: lxc/network.go:670 lxc/network.go:1154
+msgid "[<remote>:]<network> <key>"
 msgstr ""
 
-#: lxc/config_device.go:22
-msgid "device"
+#: lxc/network.go:1022
+msgid "[<remote>:]<network> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:889
-msgid "disabled"
+#: lxc/network.go:971
+msgid "[<remote>:]<network> <new-name>"
 msgstr ""
 
-#: lxc/storage.go:445
-msgid "driver"
+#: lxc/network.go:462
+msgid "[<remote>:]<network> <profile> [<device name>]"
 msgstr ""
 
-#: lxc/cluster.go:420
-msgid "edit [<remote>:]<cluster member>"
+#: lxc/network.go:180
+msgid "[<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr ""
 
-#: lxc/image.go:326
-msgid "edit [<remote>:]<image>"
+#: lxc/network.go:253
+msgid "[<remote>:]<network> [key=value...]"
 msgstr ""
 
-#: lxc/config_metadata.go:50
-msgid "edit [<remote>:]<instance>"
+#: lxc/operation.go:50 lxc/operation.go:179
+msgid "[<remote>:]<operation>"
 msgstr ""
 
-#: lxc/config_template.go:148
-msgid "edit [<remote>:]<instance> <template>"
+#: lxc/storage.go:160 lxc/storage.go:211 lxc/storage.go:386 lxc/storage.go:649
+#: lxc/storage_volume.go:1078
+msgid "[<remote>:]<pool>"
 msgstr ""
 
-#: lxc/file.go:152
-msgid "edit [<remote>:]<instance>/<path>"
+#: lxc/storage.go:87
+msgid "[<remote>:]<pool> <driver> [key=value...]"
 msgstr ""
 
-#: lxc/network.go:547
-msgid "edit [<remote>:]<network>"
+#: lxc/storage.go:331 lxc/storage.go:733
+msgid "[<remote>:]<pool> <key>"
 msgstr ""
 
-#: lxc/storage.go:211
-msgid "edit [<remote>:]<pool>"
+#: lxc/storage.go:580
+msgid "[<remote>:]<pool> <key> <value>"
 msgstr ""
 
-#: lxc/storage_volume.go:788
-msgid "edit [<remote>:]<pool> <volume>[/<snapshot>]"
+#: lxc/storage_volume.go:1190
+msgid ""
+"[<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new snapshot "
+"name>]"
 msgstr ""
 
-#: lxc/profile.go:402
-msgid "edit [<remote>:]<profile>"
+#: lxc/storage_volume.go:625
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
-#: lxc/project.go:212
-msgid "edit [<remote>:]<project>"
+#: lxc/storage_volume.go:138
+msgid "[<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
-#: lxc/config.go:87
-msgid "edit [<remote>:][<instance>[/<snapshot>]]"
+#: lxc/storage_volume.go:1478
+msgid "[<remote>:]<pool> <volume> <key>"
 msgstr ""
 
-#: lxc/cluster.go:335
-msgid "enable [<remote>:] <name>"
+#: lxc/storage_volume.go:1303
+msgid "[<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:891
-msgid "enabled"
+#: lxc/storage_volume.go:1587
+msgid "[<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/action.go:295
-#, c-format
-msgid "error: %v"
+#: lxc/storage_volume.go:1511
+msgid "[<remote>:]<pool> <volume> [<snapshot>]"
 msgstr ""
 
-#: lxc/exec.go:38
-msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
+#: lxc/storage_volume.go:470
+msgid "[<remote>:]<pool> <volume> [key=value...]"
 msgstr ""
 
-#: lxc/info.go:578
-#, c-format
-msgid "expires at %s"
+#: lxc/storage_volume.go:548 lxc/storage_volume.go:788
+#: lxc/storage_volume.go:1379
+msgid "[<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/image.go:451
-msgid "export [<remote>:]<image> [<target>]"
+#: lxc/storage_volume.go:988
+msgid "[<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
-#: lxc/export.go:30
-msgid ""
-"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+#: lxc/config_device.go:270 lxc/config_device.go:628 lxc/profile.go:298
+#: lxc/profile.go:351 lxc/profile.go:402 lxc/profile.go:819
+msgid "[<remote>:]<profile>"
 msgstr ""
 
-#: lxc/file.go:70
-msgid "file"
+#: lxc/config_device.go:190 lxc/config_device.go:700
+msgid "[<remote>:]<profile> <device> <key>"
 msgstr ""
 
-#: lxc/config_device.go:188
-msgid "get [<remote>:]<instance> <device> <key>"
+#: lxc/config_device.go:526
+msgid "[<remote>:]<profile> <device> <key>=<value>..."
 msgstr ""
 
-#: lxc/network.go:670
-msgid "get [<remote>:]<network> <key>"
+#: lxc/config_device.go:83
+msgid "[<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/storage.go:331
-msgid "get [<remote>:]<pool> <key>"
+#: lxc/profile.go:526 lxc/profile.go:873
+msgid "[<remote>:]<profile> <key>"
 msgstr ""
 
-#: lxc/storage_volume.go:988
-msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
+#: lxc/profile.go:760
+msgid "[<remote>:]<profile> <key><value>..."
 msgstr ""
 
-#: lxc/config_device.go:190
-msgid "get [<remote>:]<profile> <device> <key>"
+#: lxc/config_device.go:425
+msgid "[<remote>:]<profile> <name>..."
 msgstr ""
 
-#: lxc/profile.go:526
-msgid "get [<remote>:]<profile> <key>"
+#: lxc/profile.go:709
+msgid "[<remote>:]<profile> <new-name>"
 msgstr ""
 
-#: lxc/project.go:332
-msgid "get [<remote>:]<project> <key>"
+#: lxc/profile.go:241
+msgid "[<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/config.go:358
-msgid "get [<remote>:][<instance>] <key>"
+#: lxc/project.go:84 lxc/project.go:148 lxc/project.go:212 lxc/project.go:624
+#: lxc/project.go:677
+msgid "[<remote>:]<project>"
 msgstr ""
 
-#: lxc/remote.go:421
-msgid "get-default"
+#: lxc/project.go:332 lxc/project.go:595
+msgid "[<remote>:]<project> <key>"
 msgstr ""
 
-#: lxc/image.go:36
-msgid "image"
+#: lxc/project.go:535
+msgid "[<remote>:]<project> <key>=<value>..."
 msgstr ""
 
-#: lxc/image.go:610
-msgid ""
-"import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
-"[key=value...]"
+#: lxc/project.go:479
+msgid "[<remote>:]<project> <new-name>"
 msgstr ""
 
-#: lxc/import.go:26
-msgid "import [<remote>:] <backup file>"
+#: lxc/copy.go:37
+msgid "[<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
-#: lxc/storage.go:443
-msgid "info"
+#: lxc/config.go:87 lxc/config.go:608
+msgid "[<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/image.go:838
-msgid "info [<remote>:]<image>"
+#: lxc/info.go:31
+msgid "[<remote>:][<instance>]"
 msgstr ""
 
-#: lxc/network.go:728
-msgid "info [<remote>:]<network>"
+#: lxc/config.go:358 lxc/config.go:732
+msgid "[<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/storage.go:386
-msgid "info [<remote>:]<pool>"
+#: lxc/config.go:450
+msgid "[<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/info.go:31
-msgid "info [<remote>:][<instance>]"
+#: lxc/remote.go:82
+msgid "[<remote>] <IP|FQDN|URL>"
 msgstr ""
 
 #: lxc/init.go:38
-msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
+msgid "[[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid "launch [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/project.go:451
+msgid "current"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:456
-msgid "list"
+#: lxc/remote.go:510
+msgid "default"
 msgstr ""
 
-#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:807
-#: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
-msgid "list [<remote>:]"
+#: lxc/storage.go:446
+msgid "description"
 msgstr ""
 
-#: lxc/image.go:972 lxc/list.go:42
-msgid "list [<remote>:] [<filter>...]"
+#: lxc/image.go:889
+msgid "disabled"
 msgstr ""
 
-#: lxc/image_alias.go:147
-msgid "list [<remote>:] [<filters>...]"
+#: lxc/storage.go:445
+msgid "driver"
 msgstr ""
 
-#: lxc/config_device.go:268 lxc/config_template.go:234
-msgid "list [<remote>:]<instance>"
+#: lxc/image.go:891
+msgid "enabled"
 msgstr ""
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
+#: lxc/action.go:295
+#, c-format
+msgid "error: %v"
 msgstr ""
 
-#: lxc/config_device.go:270
-msgid "list [<remote>:]<profile>"
+#: lxc/info.go:578
+#, c-format
+msgid "expires at %s"
 msgstr ""
 
-#: lxc/network.go:903
-msgid "list-leases [<remote>:]<network>"
+#: lxc/storage.go:443
+msgid "info"
 msgstr ""
 
 #: lxc/alias.go:56
@@ -4005,35 +4062,10 @@ msgid ""
 "\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "manpage <target>"
-msgstr ""
-
-#: lxc/config_metadata.go:25
-msgid "metadata"
-msgstr ""
-
-#: lxc/monitor.go:28
-msgid "monitor [<remote>:]"
-msgstr ""
-
-#: lxc/storage_volume.go:1158
-msgid "move <pool>/<volume> <pool>/<volume>"
-msgstr ""
-
-#: lxc/move.go:33
-msgid ""
-"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
-msgstr ""
-
 #: lxc/storage.go:444
 msgid "name"
 msgstr ""
 
-#: lxc/network.go:31
-msgid "network"
-msgstr ""
-
 #: lxc/image.go:879 lxc/image.go:884 lxc/image.go:1071
 msgid "no"
 msgstr ""
@@ -4042,233 +4074,14 @@ msgstr ""
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/operation.go:22
-msgid "operation"
-msgstr ""
-
-#: lxc/config_device.go:334
-msgid "override [<remote>:]<instance> <device> [key=value...]"
-msgstr ""
-
-#: lxc/action.go:48
-msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
 #: lxc/config.go:53
 msgid "please use `lxc profile`"
 msgstr ""
 
-#: lxc/profile.go:27
-msgid "profile"
-msgstr ""
-
-#: lxc/project.go:27
-msgid "project"
-msgstr ""
-
-#: lxc/publish.go:29
-msgid ""
-"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
-msgstr ""
-
-#: lxc/file.go:215
-msgid ""
-"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
-"path>"
-msgstr ""
-
-#: lxc/file.go:405
-msgid ""
-"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
-"<path>...]"
-msgstr ""
-
-#: lxc/query.go:30
-msgid "query [<remote>:]<API path>"
-msgstr ""
-
-#: lxc/image.go:1271
-msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
-#: lxc/remote.go:31
-msgid "remote"
-msgstr ""
-
-#: lxc/alias.go:192
-msgid "remove <alias>"
-msgstr ""
-
-#: lxc/remote.go:598
-msgid "remove <remote>"
-msgstr ""
-
-#: lxc/config_trust.go:190
-msgid "remove [<remote>:] <hostname|fingerprint>"
-msgstr ""
-
-#: lxc/config_device.go:423
-msgid "remove [<remote>:]<instance> <name>..."
-msgstr ""
-
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
-msgstr ""
-
-#: lxc/cluster.go:251
-msgid "remove [<remote>:]<member>"
-msgstr ""
-
-#: lxc/config_device.go:425
-msgid "remove [<remote>:]<profile> <name>..."
-msgstr ""
-
-#: lxc/alias.go:141
-msgid "rename <old alias> <new alias>"
-msgstr ""
-
-#: lxc/remote.go:536
-msgid "rename <remote> <new-name>"
-msgstr ""
-
-#: lxc/image_alias.go:249
-msgid "rename [<remote>:]<alias> <new-name>"
-msgstr ""
-
-#: lxc/rename.go:19
-msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
-msgstr ""
-
-#: lxc/cluster.go:201
-msgid "rename [<remote>:]<member> <new-name>"
-msgstr ""
-
-#: lxc/network.go:971
-msgid "rename [<remote>:]<network> <new-name>"
-msgstr ""
-
-#: lxc/storage_volume.go:1190
-msgid ""
-"rename [<remote>:]<pool> <old name>[/<old snapshot name>] <new name>[/<new "
-"snapshot name>]"
-msgstr ""
-
-#: lxc/profile.go:709
-msgid "rename [<remote>:]<profile> <new-name>"
-msgstr ""
-
-#: lxc/project.go:479
-msgid "rename [<remote>:]<project> <new-name>"
-msgstr ""
-
-#: lxc/action.go:68
-msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
-msgstr ""
-
-#: lxc/restore.go:22
-msgid "restore [<remote>:]<instance> <snapshot>"
-msgstr ""
-
-#: lxc/storage_volume.go:1587
-msgid "restore [<remote>:]<pool> <volume> <snapshot>"
-msgstr ""
-
-#: lxc/config_device.go:519
-msgid "set [<remote>:]<instance> <device> <key>=<value>..."
-msgstr ""
-
-#: lxc/network.go:1022
-msgid "set [<remote>:]<network> <key>=<value>..."
-msgstr ""
-
-#: lxc/storage.go:580
-msgid "set [<remote>:]<pool> <key> <value>"
-msgstr ""
-
-#: lxc/storage_volume.go:1303
-msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
-msgstr ""
-
-#: lxc/config_dev