[lxc-devel] [lxd/master] Refresh CLI help for instances/VM support

stgraber on Github lxc-bot at linuxcontainers.org
Mon Jan 13 20:15:56 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/20200113/a0b284d7/attachment-0001.bin>
-------------- next part --------------
From 45912cb96da9f2871a616ade3010b63af7c78055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 13 Jan 2020 15:13:16 -0500
Subject: [PATCH 1/4] lxc: Don't use instance when referring to server
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/cluster.go | 12 ++++++------
 lxc/copy.go    |  4 ++--
 lxc/move.go    |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lxc/cluster.go b/lxc/cluster.go
index c147e54155..5fcf8687bc 100644
--- a/lxc/cluster.go
+++ b/lxc/cluster.go
@@ -327,11 +327,11 @@ type cmdClusterEnable struct {
 func (c *cmdClusterEnable) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("enable [<remote>:] <name>")
-	cmd.Short = i18n.G("Enable clustering on a single non-clustered LXD instance")
+	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 instance
+		`Enable clustering on a single non-clustered LXD server
 
-  This command turns a non-clustered LXD instance into the first member of a new
+  This command turns a non-clustered LXD server into the first member of a new
   LXD cluster, which will have the given name.
 
   It's required that the LXD is already available on the network. You can check
@@ -365,14 +365,14 @@ func (c *cmdClusterEnable) Run(cmd *cobra.Command, args []string) error {
 
 	resource := resources[0]
 
-	// Check if the LXD instance is available on the network.
+	// Check if the LXD server is available on the network.
 	server, _, err := resource.server.GetServer()
 	if err != nil {
 		return errors.Wrap(err, "Failed to retrieve current server config")
 	}
 
 	if server.Config["core.https_address"] == "" {
-		return fmt.Errorf("This LXD instance is not available on the network")
+		return fmt.Errorf("This LXD server is not available on the network")
 	}
 
 	// Check if already enabled
@@ -382,7 +382,7 @@ func (c *cmdClusterEnable) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	if currentCluster.Enabled {
-		return fmt.Errorf("This LXD instance is already clustered")
+		return fmt.Errorf("This LXD server is already clustered")
 	}
 
 	// Enable clustering.
diff --git a/lxc/copy.go b/lxc/copy.go
index b5a6e0b8d0..b2fc86832d 100644
--- a/lxc/copy.go
+++ b/lxc/copy.go
@@ -37,9 +37,9 @@ func (c *cmdCopy) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]")
 	cmd.Aliases = []string{"cp"}
-	cmd.Short = i18n.G("Copy containers within or in between LXD instances")
+	cmd.Short = i18n.G("Copy containers within or in between LXD servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Copy containers within or in between LXD instances`))
+		`Copy containers within or in between LXD servers`))
 
 	cmd.RunE = c.Run
 	cmd.Flags().StringArrayVarP(&c.flagConfig, "config", "c", nil, i18n.G("Config key/value to apply to the new container")+"``")
diff --git a/lxc/move.go b/lxc/move.go
index 2931e22744..257dfcda61 100644
--- a/lxc/move.go
+++ b/lxc/move.go
@@ -33,9 +33,9 @@ func (c *cmdMove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/<snapshot>]]")
 	cmd.Aliases = []string{"mv"}
-	cmd.Short = i18n.G("Move containers within or in between LXD instances")
+	cmd.Short = i18n.G("Move containers within or in between LXD servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Move containers within or in between LXD instances`))
+		`Move containers within or in between LXD servers`))
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc move [<remote>:]<source container> [<remote>:][<destination container>] [--container-only]
     Move a container between two hosts, renaming it if destination name differs.
@@ -233,7 +233,7 @@ func moveClusterContainer(conf *config.Config, sourceResource, destResource, tar
 
 	// Check that it's a cluster
 	if !source.IsClustered() {
-		return fmt.Errorf(i18n.G("The source LXD instance is not clustered"))
+		return fmt.Errorf(i18n.G("The source LXD server is not clustered"))
 	}
 
 	// The migrate API will do the right thing when passed a target.

From 667b331f582bef0d4001d82310c5b5548d4a7809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 13 Jan 2020 15:04:15 -0500
Subject: [PATCH 2/4] lxc: Rename container to instance
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/action.go          |  46 +++++++++---------
 lxc/cluster.go         |   4 +-
 lxc/config.go          |  84 ++++++++++++++++-----------------
 lxc/config/config.go   |   2 +-
 lxc/config_device.go   | 104 ++++++++++++++++++++---------------------
 lxc/config_metadata.go |  24 +++++-----
 lxc/config_template.go |  50 ++++++++++----------
 lxc/console.go         |  12 ++---
 lxc/copy.go            |  52 ++++++++++-----------
 lxc/delete.go          |  12 ++---
 lxc/exec.go            |  10 ++--
 lxc/export.go          |  12 ++---
 lxc/file.go            |  54 ++++++++++-----------
 lxc/image.go           |   4 +-
 lxc/import.go          |   8 ++--
 lxc/info.go            |  16 +++----
 lxc/init.go            |  26 +++++------
 lxc/launch.go          |   8 ++--
 lxc/list.go            |  36 +++++++-------
 lxc/main.go            |   4 +-
 lxc/move.go            |  52 ++++++++++-----------
 lxc/network.go         |  36 +++++++-------
 lxc/profile.go         |  48 +++++++++----------
 lxc/publish.go         |  18 +++----
 lxc/query.go           |   4 +-
 lxc/rename.go          |   6 +--
 lxc/restore.go         |   8 ++--
 lxc/snapshot.go        |  12 ++---
 lxc/storage.go         |   2 +-
 lxc/storage_volume.go  |  38 +++++++--------
 lxc/utils.go           |  14 +++---
 31 files changed, 403 insertions(+), 403 deletions(-)

diff --git a/lxc/action.go b/lxc/action.go
index 5b83351d14..3bdcec2992 100644
--- a/lxc/action.go
+++ b/lxc/action.go
@@ -26,10 +26,10 @@ func (c *cmdStart) Command() *cobra.Command {
 	c.action = &cmdAction
 
 	cmd := c.action.Command("start")
-	cmd.Use = i18n.G("start [<remote>:]<container> [[<remote>:]<container>...]")
-	cmd.Short = i18n.G("Start containers")
+	cmd.Use = i18n.G("start [<remote>:]<instance> [[<remote>:]<instance>...]")
+	cmd.Short = i18n.G("Start instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Start containers`))
+		`Start instances`))
 
 	return cmd
 }
@@ -45,10 +45,10 @@ func (c *cmdPause) Command() *cobra.Command {
 	c.action = &cmdAction
 
 	cmd := c.action.Command("pause")
-	cmd.Use = i18n.G("pause [<remote>:]<container> [[<remote>:]<container>...]")
-	cmd.Short = i18n.G("Pause containers")
+	cmd.Use = i18n.G("pause [<remote>:]<instance> [[<remote>:]<instance>...]")
+	cmd.Short = i18n.G("Pause instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Pause containers`))
+		`Pause instances`))
 	cmd.Hidden = true
 
 	return cmd
@@ -65,10 +65,10 @@ func (c *cmdRestart) Command() *cobra.Command {
 	c.action = &cmdAction
 
 	cmd := c.action.Command("restart")
-	cmd.Use = i18n.G("restart [<remote>:]<container> [[<remote>:]<container>...]")
-	cmd.Short = i18n.G("Restart containers")
+	cmd.Use = i18n.G("restart [<remote>:]<instance> [[<remote>:]<instance>...]")
+	cmd.Short = i18n.G("Restart insances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Restart containers
+		`Restart instances
 
 The opposite of "lxc pause" is "lxc start".`))
 
@@ -86,10 +86,10 @@ func (c *cmdStop) Command() *cobra.Command {
 	c.action = &cmdAction
 
 	cmd := c.action.Command("stop")
-	cmd.Use = i18n.G("stop [<remote>:]<container> [[<remote>:]<container>...]")
-	cmd.Short = i18n.G("Stop containers")
+	cmd.Use = i18n.G("stop [<remote>:]<instance> [[<remote>:]<instance>...]")
+	cmd.Short = i18n.G("Stop instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Stop containers`))
+		`Stop instances`))
 
 	return cmd
 }
@@ -108,17 +108,17 @@ func (c *cmdAction) Command(action string) *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.RunE = c.Run
 
-	cmd.Flags().BoolVar(&c.flagAll, "all", false, i18n.G("Run command against all containers"))
+	cmd.Flags().BoolVar(&c.flagAll, "all", false, i18n.G("Run against all instances"))
 
 	if action == "stop" {
-		cmd.Flags().BoolVar(&c.flagStateful, "stateful", false, i18n.G("Store the container state"))
+		cmd.Flags().BoolVar(&c.flagStateful, "stateful", false, i18n.G("Store the instance state"))
 	} else if action == "start" {
-		cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Ignore the container state"))
+		cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Ignore the instance state"))
 	}
 
 	if shared.StringInSlice(action, []string{"restart", "stop"}) {
-		cmd.Flags().BoolVarP(&c.flagForce, "force", "f", false, i18n.G("Force the container to shutdown"))
-		cmd.Flags().IntVar(&c.flagTimeout, "timeout", -1, i18n.G("Time to wait for the container before killing it")+"``")
+		cmd.Flags().BoolVarP(&c.flagForce, "force", "f", false, i18n.G("Force the instance to shutdown"))
+		cmd.Flags().IntVar(&c.flagTimeout, "timeout", -1, i18n.G("Time to wait for the instance before killing it")+"``")
 	}
 
 	return cmd
@@ -148,7 +148,7 @@ func (c *cmdAction) doAction(action string, conf *config.Config, nameArg string)
 	}
 
 	if name == "" {
-		return fmt.Errorf(i18n.G("Must supply container name for: ")+"\"%s\"", nameArg)
+		return fmt.Errorf(i18n.G("Must supply instance name for: ")+"\"%s\"", nameArg)
 	}
 
 	if action == "start" {
@@ -157,7 +157,7 @@ func (c *cmdAction) doAction(action string, conf *config.Config, nameArg string)
 			return err
 		}
 
-		// "start" for a frozen container means "unfreeze"
+		// "start" for a frozen instance means "unfreeze"
 		if current.StatusCode == api.Frozen {
 			action = "unfreeze"
 		}
@@ -236,15 +236,15 @@ func (c *cmdAction) Run(cmd *cobra.Command, args []string) error {
 		}
 	} else {
 		if c.flagAll {
-			return fmt.Errorf(i18n.G("Both --all and container name given"))
+			return fmt.Errorf(i18n.G("Both --all and instance name given"))
 		}
 		names = args
 	}
 
-	// Run the action for every listed container
+	// Run the action for every listed instance
 	results := runBatch(names, func(name string) error { return c.doAction(cmd.Name(), conf, name) })
 
-	// Single container is easy
+	// Single instance is easy
 	if len(results) == 1 {
 		return results[0].err
 	}
@@ -266,7 +266,7 @@ func (c *cmdAction) Run(cmd *cobra.Command, args []string) error {
 
 	if !success {
 		fmt.Fprintln(os.Stderr, "")
-		return fmt.Errorf(i18n.G("Some containers failed to %s"), cmd.Name())
+		return fmt.Errorf(i18n.G("Some instances failed to %s"), cmd.Name())
 	}
 
 	return nil
diff --git a/lxc/cluster.go b/lxc/cluster.go
index 5fcf8687bc..6b0b01d879 100644
--- a/lxc/cluster.go
+++ b/lxc/cluster.go
@@ -259,11 +259,11 @@ func (c *cmdClusterRemove) promptConfirmation(name string) error {
 resort.
 
 The removed server will not be functional after this action and will require a
-full reset of LXD, losing any remaining container, image or storage volume
+full reset of LXD, losing any remaining instance, image or storage volume
 that the server may have held.
 
 When possible, a graceful removal should be preferred, this will require you to
-move any affected container, image or storage volume to another server prior to
+move any affected instance, image or storage volume to another server prior to
 the server being cleanly removed from the cluster.
 
 The --force flag should only be used if the server has died, been reinstalled
diff --git a/lxc/config.go b/lxc/config.go
index 68d33c74da..5ad44a14b3 100644
--- a/lxc/config.go
+++ b/lxc/config.go
@@ -27,9 +27,9 @@ type cmdConfig struct {
 func (c *cmdConfig) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("config")
-	cmd.Short = i18n.G("Manage container and server configuration options")
+	cmd.Short = i18n.G("Manage instance and server configuration options")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Manage container and server configuration options`))
+		`Manage instance and server configuration options`))
 
 	// Device
 	configDeviceCmd := cmdConfigDevice{global: c.global, config: c}
@@ -85,13 +85,13 @@ type cmdConfigEdit struct {
 
 func (c *cmdConfigEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:][<container>[/<snapshot>]]")
-	cmd.Short = i18n.G("Edit container or server configurations as YAML")
+	cmd.Use = i18n.G("edit [<remote>:][<instance>[/<snapshot>]]")
+	cmd.Short = i18n.G("Edit instance or server configurations as YAML")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Edit container or server configurations as YAML`))
+		`Edit instance or server configurations as YAML`))
 	cmd.Example = cli.FormatSection("", i18n.G(
-		`lxc config edit <container> < container.yaml
-    Update the container configuration from config.yaml.`))
+		`lxc config edit <instance> < instance.yaml
+    Update the instance configuration from config.yaml.`))
 
 	cmd.Flags().StringVar(&c.config.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
 	cmd.RunE = c.Run
@@ -105,7 +105,7 @@ func (c *cmdConfigEdit) helpTemplate() string {
 ### Any line starting with a '# will be ignored.
 ###
 ### A sample configuration looks like:
-### name: container1
+### name: instance1
 ### profiles:
 ### - default
 ### config:
@@ -147,7 +147,7 @@ func (c *cmdConfigEdit) Run(cmd *cobra.Command, args []string) error {
 	if resource.name != "" {
 		// Sanity checks
 		if c.config.flagTarget != "" {
-			return fmt.Errorf(i18n.G("--target cannot be used with containers"))
+			return fmt.Errorf(i18n.G("--target cannot be used with instances"))
 		}
 
 		// If stdin isn't a terminal, read text from it
@@ -202,14 +202,14 @@ func (c *cmdConfigEdit) Run(cmd *cobra.Command, args []string) error {
 
 		// Extract the current value
 		if isSnapshot {
-			var container *api.InstanceSnapshot
+			var inst *api.InstanceSnapshot
 
-			container, etag, err = resource.server.GetInstanceSnapshot(fields[0], fields[1])
+			inst, etag, err = resource.server.GetInstanceSnapshot(fields[0], fields[1])
 			if err != nil {
 				return err
 			}
 
-			brief := container.Writable()
+			brief := inst.Writable()
 			data, err = yaml.Marshal(&brief)
 			if err != nil {
 				return err
@@ -217,14 +217,14 @@ func (c *cmdConfigEdit) Run(cmd *cobra.Command, args []string) error {
 
 			currentExpiryDate = brief.ExpiresAt
 		} else {
-			var container *api.Instance
+			var inst *api.Instance
 
-			container, etag, err = resource.server.GetInstance(resource.name)
+			inst, etag, err = resource.server.GetInstance(resource.name)
 			if err != nil {
 				return err
 			}
 
-			brief := container.Writable()
+			brief := inst.Writable()
 			data, err = yaml.Marshal(&brief)
 			if err != nil {
 				return err
@@ -368,10 +368,10 @@ type cmdConfigGet struct {
 
 func (c *cmdConfigGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:][<container>] <key>")
-	cmd.Short = i18n.G("Get values for container or server configuration keys")
+	cmd.Use = i18n.G("get [<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 container or server configuration keys`))
+		`Get values for instance or server configuration keys`))
 
 	cmd.Flags().StringVar(&c.config.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
 	cmd.RunE = c.Run
@@ -403,7 +403,7 @@ func (c *cmdConfigGet) Run(cmd *cobra.Command, args []string) error {
 	if resource.name != "" {
 		// Sanity checks
 		if c.config.flagTarget != "" {
-			return fmt.Errorf(i18n.G("--target cannot be used with containers"))
+			return fmt.Errorf(i18n.G("--target cannot be used with instances"))
 		}
 
 		resp, _, err := resource.server.GetInstance(resource.name)
@@ -449,16 +449,16 @@ type cmdConfigSet struct {
 
 func (c *cmdConfigSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:][<container>] <key>=<value>...")
-	cmd.Short = i18n.G("Set container or server configuration keys")
+	cmd.Use = i18n.G("set [<remote>:][<instance>] <key>=<value>...")
+	cmd.Short = i18n.G("Set instance or server configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Set container or server configuration keys
+		`Set instance or server configuration keys
 
 For backward compatibility, a single configuration key may still be set with:
-    lxc config set [<remote>:][<container>] <key> <value>`))
+    lxc config set [<remote>:][<instance>] <key> <value>`))
 	cmd.Example = cli.FormatSection("", i18n.G(
-		`lxc config set [<remote>:]<container> limits.cpu=2
-    Will set a CPU limit of "2" for the container.
+		`lxc config set [<remote>:]<instance> limits.cpu=2
+    Will set a CPU limit of "2" for the instance.
 
 lxc config set core.https_address=[::]:8443
     Will have LXD listen on IPv4 and IPv6 port 8443.
@@ -496,7 +496,7 @@ func (c *cmdConfigSet) Run(cmd *cobra.Command, args []string) error {
 	if resource.name != "" {
 		// Sanity checks
 		if c.config.flagTarget != "" {
-			return fmt.Errorf(i18n.G("--target cannot be used with containers"))
+			return fmt.Errorf(i18n.G("--target cannot be used with instances"))
 		}
 
 		keys, err := getConfig(args[1:]...)
@@ -504,25 +504,25 @@ func (c *cmdConfigSet) Run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		container, etag, err := resource.server.GetInstance(resource.name)
+		inst, etag, err := resource.server.GetInstance(resource.name)
 		if err != nil {
 			return err
 		}
 
 		for k, v := range keys {
 			if cmd.Name() == "unset" {
-				_, ok := container.Config[k]
+				_, ok := inst.Config[k]
 				if !ok {
 					return fmt.Errorf(i18n.G("Can't unset key '%s', it's not currently set"), k)
 				}
 
-				delete(container.Config, k)
+				delete(inst.Config, k)
 			} else {
-				container.Config[k] = v
+				inst.Config[k] = v
 			}
 		}
 
-		op, err := resource.server.UpdateInstance(resource.name, container.Writable(), etag)
+		op, err := resource.server.UpdateInstance(resource.name, inst.Writable(), etag)
 		if err != nil {
 			return err
 		}
@@ -575,10 +575,10 @@ type cmdConfigShow struct {
 
 func (c *cmdConfigShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:][<container>[/<snapshot>]]")
-	cmd.Short = i18n.G("Show container or server configurations")
+	cmd.Use = i18n.G("show [<remote>:][<instance>[/<snapshot>]]")
+	cmd.Short = i18n.G("Show instance or server configurations")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Show container or server configurations`))
+		`Show instance or server configurations`))
 
 	cmd.Flags().BoolVar(&c.flagExpanded, "expanded", false, i18n.G("Show the expanded configuration"))
 	cmd.Flags().StringVar(&c.config.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
@@ -634,7 +634,7 @@ func (c *cmdConfigShow) Run(cmd *cobra.Command, args []string) error {
 	} else {
 		// Sanity checks
 		if c.config.flagTarget != "" {
-			return fmt.Errorf(i18n.G("--target cannot be used with containers"))
+			return fmt.Errorf(i18n.G("--target cannot be used with instances"))
 		}
 
 		// Instance or snapshot config
@@ -660,17 +660,17 @@ func (c *cmdConfigShow) Run(cmd *cobra.Command, args []string) error {
 			}
 		} else {
 			// Instance
-			container, _, err := resource.server.GetInstance(resource.name)
+			inst, _, err := resource.server.GetInstance(resource.name)
 			if err != nil {
 				return err
 			}
 
-			writable := container.Writable()
+			writable := inst.Writable()
 			brief = &writable
 
 			if c.flagExpanded {
-				brief.(*api.InstancePut).Config = container.ExpandedConfig
-				brief.(*api.InstancePut).Devices = container.ExpandedDevices
+				brief.(*api.InstancePut).Config = inst.ExpandedConfig
+				brief.(*api.InstancePut).Devices = inst.ExpandedDevices
 			}
 		}
 
@@ -694,10 +694,10 @@ type cmdConfigUnset struct {
 
 func (c *cmdConfigUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:][<container>] <key>")
-	cmd.Short = i18n.G("Unset container or server configuration keys")
+	cmd.Use = i18n.G("unset [<remote>:][<instance>] <key>")
+	cmd.Short = i18n.G("Unset instance or server configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Unset container or server configuration keys`))
+		`Unset instance or server configuration keys`))
 
 	cmd.Flags().StringVar(&c.config.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
 	cmd.RunE = c.Run
diff --git a/lxc/config/config.go b/lxc/config/config.go
index 01cb785530..a400d4631d 100644
--- a/lxc/config/config.go
+++ b/lxc/config/config.go
@@ -29,7 +29,7 @@ type Config struct {
 	// PromptPassword is a helper function used when encountering an encrypted key
 	PromptPassword func(filename string) (string, error) `yaml:"-"`
 
-	// ProjectOverride allows overriding the default project for container queries
+	// ProjectOverride allows overriding the default project
 	ProjectOverride string `yaml:"-"`
 
 	// Cookie jars
diff --git a/lxc/config_device.go b/lxc/config_device.go
index d543e301b5..5399a9e86f 100644
--- a/lxc/config_device.go
+++ b/lxc/config_device.go
@@ -20,9 +20,9 @@ type cmdConfigDevice struct {
 func (c *cmdConfigDevice) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("device")
-	cmd.Short = i18n.G("Manage container devices")
+	cmd.Short = i18n.G("Manage instance devices")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Manage container devices`))
+		`Manage instance devices`))
 
 	// Add
 	configDeviceAddCmd := cmdConfigDeviceAdd{global: c.global, config: c.config, profile: c.profile, configDevice: c}
@@ -71,18 +71,18 @@ type cmdConfigDeviceAdd struct {
 
 func (c *cmdConfigDeviceAdd) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("add [<remote>:]<container|profile> <device> <type> [key=value...]")
-	cmd.Short = i18n.G("Add devices to containers or profiles")
+	cmd.Use = i18n.G("add [<remote>:]<instance|profile> <device> <type> [key=value...]")
+	cmd.Short = i18n.G("Add devices to instances or profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Add devices to containers or profiles`))
+		`Add devices to instances or profiles`))
 	if c.config != nil {
 		cmd.Example = cli.FormatSection("", i18n.G(
-			`lxc config device add [<remote>:]container1 <device-name> disk source=/share/c1 path=opt
-    Will mount the host's /share/c1 onto /opt in the container.`))
+			`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.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 container.`))
+    Will mount the host's /share/c1 onto /opt in the instance.`))
 	}
 
 	cmd.RunE = c.Run
@@ -143,19 +143,19 @@ func (c *cmdConfigDeviceAdd) Run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 	} else {
-		container, etag, err := resource.server.GetInstance(resource.name)
+		inst, etag, err := resource.server.GetInstance(resource.name)
 		if err != nil {
 			return err
 		}
 
-		_, ok := container.Devices[devname]
+		_, ok := inst.Devices[devname]
 		if ok {
 			return fmt.Errorf(i18n.G("The device already exists"))
 		}
 
-		container.Devices[devname] = device
+		inst.Devices[devname] = device
 
-		op, err := resource.server.UpdateInstance(resource.name, container.Writable(), etag)
+		op, err := resource.server.UpdateInstance(resource.name, inst.Writable(), etag)
 		if err != nil {
 			return err
 		}
@@ -183,10 +183,10 @@ type cmdConfigDeviceGet struct {
 
 func (c *cmdConfigDeviceGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:]<container|profile> <device> <key>")
-	cmd.Short = i18n.G("Get values for container device configuration keys")
+	cmd.Use = i18n.G("get [<remote>:]<instance|profile> <device> <key>")
+	cmd.Short = i18n.G("Get values for instance device configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Get values for container device configuration keys`))
+		`Get values for instance device configuration keys`))
 
 	cmd.RunE = c.Run
 
@@ -229,12 +229,12 @@ func (c *cmdConfigDeviceGet) Run(cmd *cobra.Command, args []string) error {
 
 		fmt.Println(dev[key])
 	} else {
-		container, _, err := resource.server.GetInstance(resource.name)
+		inst, _, err := resource.server.GetInstance(resource.name)
 		if err != nil {
 			return err
 		}
 
-		dev, ok := container.Devices[devname]
+		dev, ok := inst.Devices[devname]
 		if !ok {
 			return fmt.Errorf(i18n.G("The device doesn't exist"))
 		}
@@ -255,11 +255,11 @@ type cmdConfigDeviceList struct {
 
 func (c *cmdConfigDeviceList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]<container|profile>")
+	cmd.Use = i18n.G("list [<remote>:]<instance|profile>")
 	cmd.Aliases = []string{"ls"}
-	cmd.Short = i18n.G("List container devices")
+	cmd.Short = i18n.G("List instance devices")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`List container devices`))
+		`List instance devices`))
 
 	cmd.RunE = c.Run
 
@@ -297,12 +297,12 @@ func (c *cmdConfigDeviceList) Run(cmd *cobra.Command, args []string) error {
 			devices = append(devices, k)
 		}
 	} else {
-		container, _, err := resource.server.GetInstance(resource.name)
+		inst, _, err := resource.server.GetInstance(resource.name)
 		if err != nil {
 			return err
 		}
 
-		for k := range container.Devices {
+		for k := range inst.Devices {
 			devices = append(devices, k)
 		}
 	}
@@ -322,7 +322,7 @@ type cmdConfigDeviceOverride struct {
 
 func (c *cmdConfigDeviceOverride) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("override [<remote>:]<container> <device> [key=value...]")
+	cmd.Use = i18n.G("override [<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`))
@@ -352,18 +352,18 @@ func (c *cmdConfigDeviceOverride) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Override the device
-	container, etag, err := resource.server.GetInstance(resource.name)
+	inst, etag, err := resource.server.GetInstance(resource.name)
 	if err != nil {
 		return err
 	}
 
 	devname := args[1]
-	_, ok := container.Devices[devname]
+	_, ok := inst.Devices[devname]
 	if ok {
 		return fmt.Errorf(i18n.G("The device already exists"))
 	}
 
-	device, ok := container.ExpandedDevices[devname]
+	device, ok := inst.ExpandedDevices[devname]
 	if !ok {
 		return fmt.Errorf(i18n.G("The profile device doesn't exist"))
 	}
@@ -381,9 +381,9 @@ func (c *cmdConfigDeviceOverride) Run(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	container.Devices[devname] = device
+	inst.Devices[devname] = device
 
-	op, err := resource.server.UpdateInstance(resource.name, container.Writable(), etag)
+	op, err := resource.server.UpdateInstance(resource.name, inst.Writable(), etag)
 	if err != nil {
 		return err
 	}
@@ -410,11 +410,11 @@ type cmdConfigDeviceRemove struct {
 
 func (c *cmdConfigDeviceRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remove [<remote>:]<container|profile> <name>...")
+	cmd.Use = i18n.G("remove [<remote>:]<instance|profile> <name>...")
 	cmd.Aliases = []string{"rm"}
-	cmd.Short = i18n.G("Remove container devices")
+	cmd.Short = i18n.G("Remove instance devices")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Remove container devices`))
+		`Remove instance devices`))
 
 	cmd.RunE = c.Run
 
@@ -460,20 +460,20 @@ func (c *cmdConfigDeviceRemove) Run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 	} else {
-		container, etag, err := resource.server.GetInstance(resource.name)
+		inst, etag, err := resource.server.GetInstance(resource.name)
 		if err != nil {
 			return err
 		}
 
 		for _, devname := range args[1:] {
-			_, ok := container.Devices[devname]
+			_, ok := inst.Devices[devname]
 			if !ok {
 				return fmt.Errorf(i18n.G("The device doesn't exist"))
 			}
-			delete(container.Devices, devname)
+			delete(inst.Devices, devname)
 		}
 
-		op, err := resource.server.UpdateInstance(resource.name, container.Writable(), etag)
+		op, err := resource.server.UpdateInstance(resource.name, inst.Writable(), etag)
 		if err != nil {
 			return err
 		}
@@ -501,17 +501,17 @@ type cmdConfigDeviceSet struct {
 
 func (c *cmdConfigDeviceSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:]<container|profile> <device> <key>=<value>...")
-	cmd.Short = i18n.G("Set container device configuration keys")
+	cmd.Use = i18n.G("set [<remote>:]<instance|profile> <device> <key>=<value>...")
+	cmd.Short = i18n.G("Set instance device configuration keys")
 	if c.config != nil {
 		cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-			`Set container device configuration keys
+			`Set instance device configuration keys
 
 For backward compatibility, a single configuration key may still be set with:
-    lxc config device set [<remote>:]<container> <device> <key> <value>`))
+    lxc config device set [<remote>:]<instance> <device> <key> <value>`))
 	} else if c.profile != nil {
 		cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-			`Set container device configuration keys
+			`Set instance device configuration keys
 
 For backward compatibility, a single configuration key may still be set with:
     lxc profile device set [<remote>:]<profile> <device> <key> <value>`))
@@ -570,11 +570,11 @@ func (c *cmdConfigDeviceSet) Run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 	} else {
-		container, etag, err := resource.server.GetInstance(resource.name)
+		inst, etag, err := resource.server.GetInstance(resource.name)
 		if err != nil {
 			return err
 		}
-		dev, ok := container.Devices[devname]
+		dev, ok := inst.Devices[devname]
 		if !ok {
 			return fmt.Errorf(i18n.G("The device doesn't exist"))
 		}
@@ -582,9 +582,9 @@ func (c *cmdConfigDeviceSet) Run(cmd *cobra.Command, args []string) error {
 		for k, v := range keys {
 			dev[k] = v
 		}
-		container.Devices[devname] = dev
+		inst.Devices[devname] = dev
 
-		op, err := resource.server.UpdateInstance(resource.name, container.Writable(), etag)
+		op, err := resource.server.UpdateInstance(resource.name, inst.Writable(), etag)
 		if err != nil {
 			return err
 		}
@@ -608,10 +608,10 @@ type cmdConfigDeviceShow struct {
 
 func (c *cmdConfigDeviceShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<container|profile>")
-	cmd.Short = i18n.G("Show full device configuration for containers or profiles")
+	cmd.Use = i18n.G("show [<remote>:]<instance|profile>")
+	cmd.Short = i18n.G("Show full device configuration for instances or profiles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Show full device configuration for containers or profiles`))
+		`Show full device configuration for instances or profiles`))
 
 	cmd.RunE = c.Run
 
@@ -647,12 +647,12 @@ func (c *cmdConfigDeviceShow) Run(cmd *cobra.Command, args []string) error {
 
 		devices = profile.Devices
 	} else {
-		container, _, err := resource.server.GetInstance(resource.name)
+		inst, _, err := resource.server.GetInstance(resource.name)
 		if err != nil {
 			return err
 		}
 
-		devices = container.Devices
+		devices = inst.Devices
 	}
 
 	data, err := yaml.Marshal(&devices)
@@ -676,10 +676,10 @@ type cmdConfigDeviceUnset struct {
 
 func (c *cmdConfigDeviceUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:]<container|profile> <device> <key>")
-	cmd.Short = i18n.G("Unset container device configuration keys")
+	cmd.Use = i18n.G("unset [<remote>:]<instance|profile> <device> <key>")
+	cmd.Short = i18n.G("Unset instance device configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Unset container device configuration keys`))
+		`Unset instance device configuration keys`))
 
 	cmd.RunE = c.Run
 
diff --git a/lxc/config_metadata.go b/lxc/config_metadata.go
index 76e8812482..b8f9dd1cad 100644
--- a/lxc/config_metadata.go
+++ b/lxc/config_metadata.go
@@ -24,9 +24,9 @@ type cmdConfigMetadata struct {
 func (c *cmdConfigMetadata) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("metadata")
-	cmd.Short = i18n.G("Manage container metadata files")
+	cmd.Short = i18n.G("Manage instance metadata files")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Manage container metadata files`))
+		`Manage instance metadata files`))
 
 	// Edit
 	configMetadataEditCmd := cmdConfigMetadataEdit{global: c.global, config: c.config, configMetadata: c}
@@ -48,10 +48,10 @@ type cmdConfigMetadataEdit struct {
 
 func (c *cmdConfigMetadataEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<container>")
-	cmd.Short = i18n.G("Edit container metadata files")
+	cmd.Use = i18n.G("edit [<remote>:]<instance>")
+	cmd.Short = i18n.G("Edit instance metadata files")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Edit container metadata files`))
+		`Edit instance metadata files`))
 
 	cmd.RunE = c.Run
 
@@ -60,7 +60,7 @@ func (c *cmdConfigMetadataEdit) Command() *cobra.Command {
 
 func (c *cmdConfigMetadataEdit) helpTemplate() string {
 	return i18n.G(
-		`### This is a yaml representation of the container metadata.
+		`### This is a yaml representation of the instance metadata.
 ### Any line starting with a '# will be ignored.
 ###
 ### A sample configuration looks like:
@@ -98,7 +98,7 @@ func (c *cmdConfigMetadataEdit) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
 	// Edit the metadata
@@ -170,10 +170,10 @@ type cmdConfigMetadataShow struct {
 
 func (c *cmdConfigMetadataShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<container>")
-	cmd.Short = i18n.G("Show container metadata files")
+	cmd.Use = i18n.G("show [<remote>:]<instance>")
+	cmd.Short = i18n.G("Show instance metadata files")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Show container metadata files`))
+		`Show instance metadata files`))
 
 	cmd.RunE = c.Run
 
@@ -196,10 +196,10 @@ func (c *cmdConfigMetadataShow) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
-	// Show the container metadata
+	// Show the instance metadata
 	metadata, _, err := resource.server.GetInstanceMetadata(resource.name)
 	if err != nil {
 		return err
diff --git a/lxc/config_template.go b/lxc/config_template.go
index 99b64bbdc6..eaf20bbd93 100644
--- a/lxc/config_template.go
+++ b/lxc/config_template.go
@@ -25,9 +25,9 @@ type cmdConfigTemplate struct {
 func (c *cmdConfigTemplate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("template")
-	cmd.Short = i18n.G("Manage container file templates")
+	cmd.Short = i18n.G("Manage instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Manage container file templates`))
+		`Manage instance file templates`))
 
 	// Create
 	configTemplateCreateCmd := cmdConfigTemplateCreate{global: c.global, config: c.config, configTemplate: c}
@@ -61,10 +61,10 @@ type cmdConfigTemplateCreate struct {
 
 func (c *cmdConfigTemplateCreate) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("create [<remote>:]<container> <template>")
-	cmd.Short = i18n.G("Create new container file templates")
+	cmd.Use = i18n.G("create [<remote>:]<instance> <template>")
+	cmd.Short = i18n.G("Create new instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Create new container file templates`))
+		`Create new instance file templates`))
 
 	cmd.RunE = c.Run
 
@@ -87,10 +87,10 @@ func (c *cmdConfigTemplateCreate) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
-	// Create container file template
+	// Create instance file template
 	return resource.server.CreateInstanceTemplateFile(resource.name, args[1], nil)
 }
 
@@ -103,11 +103,11 @@ type cmdConfigTemplateDelete struct {
 
 func (c *cmdConfigTemplateDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<container> <template>")
+	cmd.Use = i18n.G("delete [<remote>:]<instance> <template>")
 	cmd.Aliases = []string{"rm"}
-	cmd.Short = i18n.G("Delete container file templates")
+	cmd.Short = i18n.G("Delete instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Delete container file templates`))
+		`Delete instance file templates`))
 
 	cmd.RunE = c.Run
 
@@ -130,10 +130,10 @@ func (c *cmdConfigTemplateDelete) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
-	// Delete container file template
+	// Delete instance file template
 	return resource.server.DeleteInstanceTemplateFile(resource.name, args[1])
 }
 
@@ -146,10 +146,10 @@ type cmdConfigTemplateEdit struct {
 
 func (c *cmdConfigTemplateEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<container> <template>")
-	cmd.Short = i18n.G("Edit container file templates")
+	cmd.Use = i18n.G("edit [<remote>:]<instance> <template>")
+	cmd.Short = i18n.G("Edit instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Edit container file templates`))
+		`Edit instance file templates`))
 
 	cmd.RunE = c.Run
 
@@ -172,10 +172,10 @@ func (c *cmdConfigTemplateEdit) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
-	// Edit container file template
+	// Edit instance file template
 	if !termios.IsTerminal(getStdinFd()) {
 		return resource.server.UpdateInstanceTemplateFile(resource.name, args[1], os.Stdin)
 	}
@@ -232,10 +232,10 @@ type cmdConfigTemplateList struct {
 
 func (c *cmdConfigTemplateList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]<container>")
-	cmd.Short = i18n.G("List container file templates")
+	cmd.Use = i18n.G("list [<remote>:]<instance>")
+	cmd.Short = i18n.G("List instance file templates")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`List container file templates`))
+		`List instance file templates`))
 	cmd.Flags().StringVar(&c.flagFormat, "format", "table", i18n.G("Format (csv|json|table|yaml)")+"``")
 
 	cmd.RunE = c.Run
@@ -259,7 +259,7 @@ func (c *cmdConfigTemplateList) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
 	// List the templates
@@ -291,10 +291,10 @@ type cmdConfigTemplateShow struct {
 
 func (c *cmdConfigTemplateShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<container> <template>")
-	cmd.Short = i18n.G("Show content of container file templates")
+	cmd.Use = i18n.G("show [<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 container file templates`))
+		`Show content of instance file templates`))
 
 	cmd.RunE = c.Run
 
@@ -317,7 +317,7 @@ func (c *cmdConfigTemplateShow) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
 	// Show the template
diff --git a/lxc/console.go b/lxc/console.go
index fa67c2e2b6..5a64642ab1 100644
--- a/lxc/console.go
+++ b/lxc/console.go
@@ -27,16 +27,16 @@ type cmdConsole struct {
 
 func (c *cmdConsole) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("console [<remote>:]<container>")
-	cmd.Short = i18n.G("Attach to container consoles")
+	cmd.Use = i18n.G("console [<remote>:]<instance>")
+	cmd.Short = i18n.G("Attach to instance consoles")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Attach to container consoles
+		`Attach to instance consoles
 
-This command allows you to interact with the boot console of a container
+This command allows you to interact with the boot console of a instance
 as well as retrieve past log entries from it.`))
 
 	cmd.RunE = c.Run
-	cmd.Flags().BoolVar(&c.flagShowLog, "show-log", false, i18n.G("Retrieve the container's console log"))
+	cmd.Flags().BoolVar(&c.flagShowLog, "show-log", false, i18n.G("Retrieve the instance's console log"))
 
 	return cmd
 }
@@ -184,7 +184,7 @@ func (c *cmdConsole) Run(cmd *cobra.Command, args []string) error {
 
 	fmt.Printf(i18n.G("To detach from the console, press: <ctrl>+a q") + "\n\r")
 
-	// Attach to the container console
+	// Attach to the instance console
 	op, err := d.ConsoleInstance(name, req, &consoleArgs)
 	if err != nil {
 		return err
diff --git a/lxc/copy.go b/lxc/copy.go
index b2fc86832d..1624884e2a 100644
--- a/lxc/copy.go
+++ b/lxc/copy.go
@@ -37,29 +37,29 @@ func (c *cmdCopy) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]")
 	cmd.Aliases = []string{"cp"}
-	cmd.Short = i18n.G("Copy containers within or in between LXD servers")
+	cmd.Short = i18n.G("Copy instances within or in between LXD servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Copy containers within or in between LXD servers`))
+		`Copy instances within or in between LXD servers`))
 
 	cmd.RunE = c.Run
-	cmd.Flags().StringArrayVarP(&c.flagConfig, "config", "c", nil, i18n.G("Config key/value to apply to the new container")+"``")
+	cmd.Flags().StringArrayVarP(&c.flagConfig, "config", "c", nil, i18n.G("Config key/value to apply to the new instance")+"``")
 	cmd.Flags().StringArrayVarP(&c.flagDevice, "device", "d", nil, i18n.G("New key/value to apply to a specific device")+"``")
-	cmd.Flags().StringArrayVarP(&c.flagProfile, "profile", "p", nil, i18n.G("Profile to apply to the new container")+"``")
-	cmd.Flags().BoolVarP(&c.flagEphemeral, "ephemeral", "e", false, i18n.G("Ephemeral container"))
+	cmd.Flags().StringArrayVarP(&c.flagProfile, "profile", "p", nil, i18n.G("Profile to apply to the new instance")+"``")
+	cmd.Flags().BoolVarP(&c.flagEphemeral, "ephemeral", "e", false, i18n.G("Ephemeral instance"))
 	cmd.Flags().StringVar(&c.flagMode, "mode", "pull", i18n.G("Transfer mode. One of pull (default), push or relay")+"``")
 	cmd.Flags().BoolVar(&c.flagInstanceOnly, "instance-only", false, i18n.G("Copy the instance without its snapshots"))
-	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false, i18n.G("Copy the container without its snapshots (deprecated, use instance-only)"))
-	cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Copy a stateful container stateless"))
+	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false, i18n.G("Copy the instance without its snapshots (deprecated, use instance-only)"))
+	cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Copy a stateful instance stateless"))
 	cmd.Flags().StringVarP(&c.flagStorage, "storage", "s", "", i18n.G("Storage pool name")+"``")
 	cmd.Flags().StringVar(&c.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
 	cmd.Flags().StringVar(&c.flagTargetProject, "target-project", "", i18n.G("Copy to a project different from the source")+"``")
-	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Create the container with no profiles applied"))
+	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Create the instance with no profiles applied"))
 	cmd.Flags().BoolVar(&c.flagRefresh, "refresh", false, i18n.G("Perform an incremental copy"))
 
 	return cmd
 }
 
-func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, destResource string, keepVolatile bool, ephemeral int, stateful bool, containerOnly bool, mode string, pool string, move bool) error {
+func (c *cmdCopy) copyInstance(conf *config.Config, sourceResource string, destResource string, keepVolatile bool, ephemeral int, stateful bool, instanceOnly bool, mode string, pool string, move bool) error {
 	// Parse the source
 	sourceRemote, sourceName, err := conf.ParseRemote(sourceResource)
 	if err != nil {
@@ -72,14 +72,14 @@ func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, dest
 		return err
 	}
 
-	// Make sure we have a container or snapshot name
+	// Make sure we have a instance or snapshot name
 	if sourceName == "" {
-		return fmt.Errorf(i18n.G("You must specify a source container name"))
+		return fmt.Errorf(i18n.G("You must specify a source instance name"))
 	}
 
-	// Check that a destination container was specified, if --target is passed.
+	// Check that a destination instance was specified, if --target is passed.
 	if destName == "" && c.flagTarget != "" {
-		return fmt.Errorf(i18n.G("You must specify a destination container name when using --target"))
+		return fmt.Errorf(i18n.G("You must specify a destination instance name when using --target"))
 	}
 
 	// If no destination name was provided, use the same as the source
@@ -149,8 +149,8 @@ func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, dest
 	var start bool
 
 	if shared.IsSnapshot(sourceName) {
-		if containerOnly {
-			return fmt.Errorf(i18n.G("--container-only can't be passed when the source is a snapshot"))
+		if instanceOnly {
+			return fmt.Errorf(i18n.G("--instance-only can't be passed when the source is a snapshot"))
 		}
 
 		// Prepare the instance creation request
@@ -161,10 +161,10 @@ func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, dest
 		}
 
 		if c.flagRefresh {
-			return fmt.Errorf(i18n.G("--refresh can only be used with containers"))
+			return fmt.Errorf(i18n.G("--refresh can only be used with instances"))
 		}
 
-		// Copy of a snapshot into a new container
+		// Copy of a snapshot into a new instance
 		srcFields := strings.SplitN(sourceName, shared.SnapshotDelimiter, 2)
 		entry, _, err := source.GetInstanceSnapshot(srcFields[0], srcFields[1])
 		if err != nil {
@@ -249,16 +249,16 @@ func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, dest
 			return err
 		}
 	} else {
-		// Prepare the container creation request
+		// Prepare the instance creation request
 		args := lxd.InstanceCopyArgs{
 			Name:         destName,
 			Live:         stateful,
-			InstanceOnly: containerOnly,
+			InstanceOnly: instanceOnly,
 			Mode:         mode,
 			Refresh:      c.flagRefresh,
 		}
 
-		// Copy of a container into a new container
+		// Copy of an instance into a new instance
 		entry, _, err := source.GetInstance(sourceName)
 		if err != nil {
 			return err
@@ -351,7 +351,7 @@ func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, dest
 
 	// Watch the background operation
 	progress := utils.ProgressRenderer{
-		Format: i18n.G("Transferring container: %s"),
+		Format: i18n.G("Transferring instance: %s"),
 		Quiet:  c.global.flagQuiet,
 	}
 
@@ -372,7 +372,7 @@ func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, dest
 	if c.flagRefresh {
 		inst, etag, err := dest.GetInstance(destName)
 		if err != nil {
-			return fmt.Errorf("Failed to refresh target container '%s': %v", destName, err)
+			return fmt.Errorf("Failed to refresh target instance '%s': %v", destName, err)
 		}
 
 		// Ensure we don't change the target's volatile.idmap.next value.
@@ -385,7 +385,7 @@ func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, dest
 
 		// Watch the background operation
 		progress := utils.ProgressRenderer{
-			Format: i18n.G("Refreshing container: %s"),
+			Format: i18n.G("Refreshing instance: %s"),
 			Quiet:  c.global.flagQuiet,
 		}
 
@@ -427,7 +427,7 @@ func (c *cmdCopy) copyContainer(conf *config.Config, sourceResource string, dest
 		fmt.Printf(i18n.G("Instance name is: %s")+"\n", fields[len(fields)-1])
 	}
 
-	// Start the container if needed
+	// Start the instance if needed
 	if start {
 		req := api.InstanceStatePut{
 			Action: string(shared.Start),
@@ -475,9 +475,9 @@ func (c *cmdCopy) Run(cmd *cobra.Command, args []string) error {
 
 	// If not target name is specified, one will be chosed by the server
 	if len(args) < 2 {
-		return c.copyContainer(conf, args[0], "", keepVolatile, ephem, stateful, instanceOnly, mode, c.flagStorage, false)
+		return c.copyInstance(conf, args[0], "", keepVolatile, ephem, stateful, instanceOnly, mode, c.flagStorage, false)
 	}
 
 	// Normal copy with a pre-determined name
-	return c.copyContainer(conf, args[0], args[1], keepVolatile, ephem, stateful, instanceOnly, mode, c.flagStorage, false)
+	return c.copyInstance(conf, args[0], args[1], keepVolatile, ephem, stateful, instanceOnly, mode, c.flagStorage, false)
 }
diff --git a/lxc/delete.go b/lxc/delete.go
index de4ec8c4c1..b7c0529be2 100644
--- a/lxc/delete.go
+++ b/lxc/delete.go
@@ -24,14 +24,14 @@ type cmdDelete struct {
 
 func (c *cmdDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/<snapshot>]...]")
+	cmd.Use = i18n.G("delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]")
 	cmd.Aliases = []string{"rm"}
-	cmd.Short = i18n.G("Delete containers and snapshots")
+	cmd.Short = i18n.G("Delete instances and snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Delete containers and snapshots`))
+		`Delete instances and snapshots`))
 
 	cmd.RunE = c.Run
-	cmd.Flags().BoolVarP(&c.flagForce, "force", "f", false, i18n.G("Force the removal of running containers"))
+	cmd.Flags().BoolVarP(&c.flagForce, "force", "f", false, i18n.G("Force the removal of running instances"))
 	cmd.Flags().BoolVarP(&c.flagInteractive, "interactive", "i", false, i18n.G("Require user confirmation"))
 
 	return cmd
@@ -101,7 +101,7 @@ func (c *cmdDelete) Run(cmd *cobra.Command, args []string) error {
 
 		if ct.StatusCode != 0 && ct.StatusCode != api.Stopped {
 			if !c.flagForce {
-				return fmt.Errorf(i18n.G("The container is currently running, stop it first or pass --force"))
+				return fmt.Errorf(i18n.G("The instance is currently running, stop it first or pass --force"))
 			}
 
 			req := api.InstanceStatePut{
@@ -117,7 +117,7 @@ func (c *cmdDelete) Run(cmd *cobra.Command, args []string) error {
 
 			err = op.Wait()
 			if err != nil {
-				return fmt.Errorf(i18n.G("Stopping the container failed: %s"), err)
+				return fmt.Errorf(i18n.G("Stopping the instance failed: %s"), err)
 			}
 
 			if ct.Ephemeral == true {
diff --git a/lxc/exec.go b/lxc/exec.go
index 5686a65255..009941504f 100644
--- a/lxc/exec.go
+++ b/lxc/exec.go
@@ -36,17 +36,17 @@ type cmdExec struct {
 
 func (c *cmdExec) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("exec [<remote>:]<container> [flags] [--] <command line>")
-	cmd.Short = i18n.G("Execute commands in containers")
+	cmd.Use = i18n.G("exec [<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 containers
+		`Execute commands in instances
 
 The command is executed directly using exec, so there is no shell and
 shell patterns (variables, file redirects, ...) won't be understood.
 If you need a shell environment you need to execute the shell
 executable, passing the shell commands as arguments, for example:
 
-  lxc exec <container> -- sh -c "cd /tmp && pwd"
+  lxc exec <instance> -- sh -c "cd /tmp && pwd"
 
 Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored).`))
 
@@ -210,7 +210,7 @@ func (c *cmdExec) Run(cmd *cobra.Command, args []string) error {
 		DataDone: make(chan bool),
 	}
 
-	// Run the command in the container
+	// Run the command in the instance
 	op, err := d.ExecInstance(name, req, &execArgs)
 	if err != nil {
 		return err
diff --git a/lxc/export.go b/lxc/export.go
index e4f49df717..7a00828b6b 100644
--- a/lxc/export.go
+++ b/lxc/export.go
@@ -28,13 +28,13 @@ type cmdExport struct {
 
 func (c *cmdExport) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("export [<remote>:]<container> [target] [--container-only] [--optimized-storage]")
-	cmd.Short = i18n.G("Export container backups")
+	cmd.Use = i18n.G("export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]")
+	cmd.Short = i18n.G("Export instance backups")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Export containers as backup tarballs.`))
+		`Export instances as backup tarballs.`))
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc export u1 backup0.tar.gz
-    Download a backup tarball of the u1 container.`))
+    Download a backup tarball of the u1 instance.`))
 
 	cmd.RunE = c.Run
 	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false,
@@ -81,7 +81,7 @@ func (c *cmdExport) Run(cmd *cobra.Command, args []string) error {
 
 	op, err := d.CreateInstanceBackup(name, req)
 	if err != nil {
-		return errors.Wrap(err, "Create container backup")
+		return errors.Wrap(err, "Create instance backup")
 	}
 
 	// Wait until backup is done
@@ -130,7 +130,7 @@ func (c *cmdExport) Run(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		os.Remove(targetName)
 		progress.Done("")
-		return errors.Wrap(err, "Fetch container backup file")
+		return errors.Wrap(err, "Fetch instance backup file")
 	}
 
 	progress.Done(i18n.G("Backup exported successfully!"))
diff --git a/lxc/file.go b/lxc/file.go
index 9f2baeabd1..83c5255f1c 100644
--- a/lxc/file.go
+++ b/lxc/file.go
@@ -36,7 +36,7 @@ type cmdFile struct {
 	flagRecursive bool
 }
 
-func fileGetWrapper(server lxd.InstanceServer, container string, path string) (buf io.ReadCloser, resp *lxd.InstanceFileResponse, err error) {
+func fileGetWrapper(server lxd.InstanceServer, inst string, path string) (buf io.ReadCloser, resp *lxd.InstanceFileResponse, err error) {
 	// Signal handling
 	chSignal := make(chan os.Signal)
 	signal.Notify(chSignal, os.Interrupt)
@@ -44,7 +44,7 @@ func fileGetWrapper(server lxd.InstanceServer, container string, path string) (b
 	// Operation handling
 	chDone := make(chan bool)
 	go func() {
-		buf, resp, err = server.GetInstanceFile(container, path)
+		buf, resp, err = server.GetInstanceFile(inst, path)
 		close(chDone)
 	}()
 
@@ -68,9 +68,9 @@ func fileGetWrapper(server lxd.InstanceServer, container string, path string) (b
 func (c *cmdFile) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("file")
-	cmd.Short = i18n.G("Manage files in containers")
+	cmd.Short = i18n.G("Manage files in instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Manage files in containers`))
+		`Manage files in instances`))
 
 	// Delete
 	fileDeleteCmd := cmdFileDelete{global: c.global, file: c}
@@ -99,11 +99,11 @@ type cmdFileDelete struct {
 
 func (c *cmdFileDelete) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]")
+	cmd.Use = i18n.G("delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]")
 	cmd.Aliases = []string{"rm"}
-	cmd.Short = i18n.G("Delete files in containers")
+	cmd.Short = i18n.G("Delete files in instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Delete files in containers`))
+		`Delete files in instances`))
 
 	cmd.RunE = c.Run
 
@@ -149,10 +149,10 @@ type cmdFileEdit struct {
 
 func (c *cmdFileEdit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("edit [<remote>:]<container>/<path>")
-	cmd.Short = i18n.G("Edit files in containers")
+	cmd.Use = i18n.G("edit [<remote>:]<instance>/<path>")
+	cmd.Short = i18n.G("Edit files in instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Edit files in containers`))
+		`Edit files in instances`))
 
 	cmd.RunE = c.Run
 
@@ -212,13 +212,13 @@ type cmdFilePull struct {
 
 func (c *cmdFilePull) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] <target path>")
-	cmd.Short = i18n.G("Pull files from containers")
+	cmd.Use = i18n.G("pull [<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 containers`))
+		`Pull files from instances`))
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc file pull foo/etc/hosts .
-   To pull /etc/hosts from the container and write it to the current directory.`))
+   To pull /etc/hosts from the instance and write it to the current directory.`))
 
 	cmd.Flags().BoolVarP(&c.file.flagMkdir, "create-dirs", "p", false, i18n.G("Create any directories necessary"))
 	cmd.Flags().BoolVarP(&c.file.flagRecursive, "recursive", "r", false, i18n.G("Recursively transfer files"))
@@ -402,13 +402,13 @@ type cmdFilePush struct {
 
 func (c *cmdFilePush) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]")
-	cmd.Short = i18n.G("Push files into containers")
+	cmd.Use = i18n.G("push <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 containers`))
+		`Push files into instances`))
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc file push /etc/hosts foo/etc/hosts
-   To push /etc/hosts into the container "foo".`))
+   To push /etc/hosts into the instance "foo".`))
 
 	cmd.Flags().BoolVarP(&c.file.flagRecursive, "recursive", "r", false, i18n.G("Recursively transfer files"))
 	cmd.Flags().BoolVarP(&c.file.flagMkdir, "create-dirs", "p", false, i18n.G("Create any directories necessary"))
@@ -648,8 +648,8 @@ func (c *cmdFilePush) Run(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (c *cmdFile) recursivePullFile(d lxd.InstanceServer, container string, p string, targetDir string) error {
-	buf, resp, err := d.GetInstanceFile(container, p)
+func (c *cmdFile) recursivePullFile(d lxd.InstanceServer, inst string, p string, targetDir string) error {
+	buf, resp, err := d.GetInstanceFile(inst, p)
 	if err != nil {
 		return err
 	}
@@ -666,7 +666,7 @@ func (c *cmdFile) recursivePullFile(d lxd.InstanceServer, container string, p st
 		for _, ent := range resp.Entries {
 			nextP := path.Join(p, ent)
 
-			err := c.recursivePullFile(d, container, nextP, target)
+			err := c.recursivePullFile(d, inst, nextP, target)
 			if err != nil {
 				return err
 			}
@@ -723,7 +723,7 @@ func (c *cmdFile) recursivePullFile(d lxd.InstanceServer, container string, p st
 	return nil
 }
 
-func (c *cmdFile) recursivePushFile(d lxd.InstanceServer, container string, source string, target string) error {
+func (c *cmdFile) recursivePushFile(d lxd.InstanceServer, inst string, source string, target string) error {
 	source = filepath.Clean(source)
 	sourceDir, _ := filepath.Split(source)
 	sourceLen := len(sourceDir)
@@ -805,7 +805,7 @@ func (c *cmdFile) recursivePushFile(d lxd.InstanceServer, container string, sour
 		}
 
 		logger.Infof("Pushing %s to %s (%s)", p, targetPath, args.Type)
-		err = d.CreateInstanceFile(container, targetPath, args)
+		err = d.CreateInstanceFile(inst, targetPath, args)
 		if err != nil {
 			if args.Type != "directory" {
 				progress.Done("")
@@ -821,8 +821,8 @@ func (c *cmdFile) recursivePushFile(d lxd.InstanceServer, container string, sour
 	return filepath.Walk(source, sendFile)
 }
 
-func (c *cmdFile) recursiveMkdir(d lxd.InstanceServer, container string, p string, mode *os.FileMode, uid int64, gid int64) error {
-	/* special case, every container has a /, we don't need to do anything */
+func (c *cmdFile) recursiveMkdir(d lxd.InstanceServer, inst string, p string, mode *os.FileMode, uid int64, gid int64) error {
+	/* special case, every instance has a /, we don't need to do anything */
 	if p == "/" {
 		return nil
 	}
@@ -835,7 +835,7 @@ func (c *cmdFile) recursiveMkdir(d lxd.InstanceServer, container string, p strin
 
 	for ; i >= 1; i-- {
 		cur := filepath.Join(parts[:i]...)
-		_, resp, err := d.GetInstanceFile(container, cur)
+		_, resp, err := d.GetInstanceFile(inst, cur)
 		if err != nil {
 			continue
 		}
@@ -868,7 +868,7 @@ func (c *cmdFile) recursiveMkdir(d lxd.InstanceServer, container string, p strin
 		}
 
 		logger.Infof("Creating %s (%s)", cur, args.Type)
-		err := d.CreateInstanceFile(container, cur, args)
+		err := d.CreateInstanceFile(inst, cur, args)
 		if err != nil {
 			return err
 		}
diff --git a/lxc/image.go b/lxc/image.go
index 9e16ae5b85..48ae03a679 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -38,8 +38,8 @@ func (c *cmdImage) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Manage images
 
-In LXD containers are created from images. Those images were themselves
-either generated from an existing container or downloaded from an image
+In LXD instances are created from images. Those images were themselves
+either generated from an existing instance or downloaded from an image
 server.
 
 When using remote images, LXD will automatically cache images for you
diff --git a/lxc/import.go b/lxc/import.go
index 189da4a01c..8a3016648c 100644
--- a/lxc/import.go
+++ b/lxc/import.go
@@ -24,12 +24,12 @@ type cmdImport struct {
 func (c *cmdImport) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("import [<remote>:] <backup file>")
-	cmd.Short = i18n.G("Import container backups")
+	cmd.Short = i18n.G("Import instance backups")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Import backups of containers including their snapshots.`))
+		`Import backups of instances including their snapshots.`))
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc import backup0.tar.gz
-    Create a new container using backup0.tar.gz as the source.`))
+    Create a new instance using backup0.tar.gz as the source.`))
 
 	cmd.RunE = c.Run
 	cmd.Flags().StringVarP(&c.flagStorage, "storage", "s", "", i18n.G("Storage pool name")+"``")
@@ -69,7 +69,7 @@ func (c *cmdImport) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	progress := utils.ProgressRenderer{
-		Format: i18n.G("Importing container: %s"),
+		Format: i18n.G("Importing instance: %s"),
 		Quiet:  c.global.flagQuiet,
 	}
 
diff --git a/lxc/info.go b/lxc/info.go
index d1bf736363..493c421e9a 100644
--- a/lxc/info.go
+++ b/lxc/info.go
@@ -27,19 +27,19 @@ type cmdInfo struct {
 
 func (c *cmdInfo) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("info [<remote>:][<container>]")
-	cmd.Short = i18n.G("Show container or server information")
+	cmd.Use = i18n.G("info [<remote>:][<instance>]")
+	cmd.Short = i18n.G("Show instance or server information")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Show container or server information`))
+		`Show instance or server information`))
 	cmd.Example = cli.FormatSection("", i18n.G(
-		`lxc info [<remote>:]<container> [--show-log]
-    For container information.
+		`lxc info [<remote>:]<instance> [--show-log]
+    For instance information.
 
 lxc info [<remote>:] [--resources]
     For LXD server information.`))
 
 	cmd.RunE = c.Run
-	cmd.Flags().BoolVar(&c.flagShowLog, "show-log", false, i18n.G("Show the container's last 100 log lines?"))
+	cmd.Flags().BoolVar(&c.flagShowLog, "show-log", false, i18n.G("Show the instance's last 100 log lines?"))
 	cmd.Flags().BoolVar(&c.flagResources, "resources", false, i18n.G("Show the resources available to the server"))
 	cmd.Flags().StringVar(&c.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
 
@@ -78,7 +78,7 @@ func (c *cmdInfo) Run(cmd *cobra.Command, args []string) error {
 		return c.remoteInfo(d)
 	}
 
-	return c.containerInfo(d, conf.Remotes[remote], cName, c.flagShowLog)
+	return c.instanceInfo(d, conf.Remotes[remote], cName, c.flagShowLog)
 }
 
 func (c *cmdInfo) renderGPU(gpu api.ResourcesGPUCard, prefix string, initial bool) {
@@ -417,7 +417,7 @@ func (c *cmdInfo) remoteInfo(d lxd.InstanceServer) error {
 	return nil
 }
 
-func (c *cmdInfo) containerInfo(d lxd.InstanceServer, remote config.Remote, name string, showLog bool) error {
+func (c *cmdInfo) instanceInfo(d lxd.InstanceServer, remote config.Remote, name string, showLog bool) error {
 	// Sanity checks
 	if c.flagTarget != "" {
 		return fmt.Errorf(i18n.G("--target cannot be used with instances"))
diff --git a/lxc/init.go b/lxc/init.go
index 3530ac214f..ad336ebe05 100644
--- a/lxc/init.go
+++ b/lxc/init.go
@@ -36,25 +36,25 @@ type cmdInit struct {
 func (c *cmdInit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("init [[<remote>:]<image>] [<remote>:][<name>] [< config")
-	cmd.Short = i18n.G("Create containers from images")
-	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(`Create containers from images`))
+	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:16.04 u1
 
 lxc init ubuntu:16.04 u1 < config.yaml
-    Create the container with configuration from config.yaml`))
+    Create the instance with configuration from config.yaml`))
 	cmd.Hidden = true
 
 	cmd.RunE = c.Run
-	cmd.Flags().StringArrayVarP(&c.flagConfig, "config", "c", nil, i18n.G("Config key/value to apply to the new container")+"``")
-	cmd.Flags().StringArrayVarP(&c.flagProfile, "profile", "p", nil, i18n.G("Profile to apply to the new container")+"``")
-	cmd.Flags().BoolVarP(&c.flagEphemeral, "ephemeral", "e", false, i18n.G("Ephemeral container"))
+	cmd.Flags().StringArrayVarP(&c.flagConfig, "config", "c", nil, i18n.G("Config key/value to apply to the new instance")+"``")
+	cmd.Flags().StringArrayVarP(&c.flagProfile, "profile", "p", nil, i18n.G("Profile to apply to the new instance")+"``")
+	cmd.Flags().BoolVarP(&c.flagEphemeral, "ephemeral", "e", false, i18n.G("Ephemeral instance"))
 	cmd.Flags().StringVarP(&c.flagNetwork, "network", "n", "", i18n.G("Network name")+"``")
 	cmd.Flags().StringVarP(&c.flagStorage, "storage", "s", "", i18n.G("Storage pool name")+"``")
 	cmd.Flags().StringVarP(&c.flagType, "type", "t", "", i18n.G("Instance type")+"``")
 	cmd.Flags().StringVar(&c.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
-	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Create the container with no profiles applied"))
-	cmd.Flags().BoolVar(&c.flagEmpty, "empty", false, i18n.G("Create an empty container"))
-	cmd.Flags().BoolVar(&c.flagVM, "vm", false, i18n.G("Create virtual machine"))
+	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Create the instance with no profiles applied"))
+	cmd.Flags().BoolVar(&c.flagEmpty, "empty", false, i18n.G("Create an empty instance"))
+	cmd.Flags().BoolVar(&c.flagVM, "vm", false, i18n.G("Create a virtual machine"))
 
 	return cmd
 }
@@ -128,7 +128,7 @@ func (c *cmdInit) create(conf *config.Config, args []string) (lxd.InstanceServer
 				return nil, "", err
 			}
 		} else if len(args) == 1 {
-			// Switch image / container names
+			// Switch image / instance names
 			name = image
 			remote = iremote
 			image = ""
@@ -299,7 +299,7 @@ func (c *cmdInit) create(conf *config.Config, args []string) (lxd.InstanceServer
 		}
 		progress.Done("")
 
-		// Extract the container name
+		// Extract the instance name
 		info, err := op.GetTarget()
 		if err != nil {
 			return nil, "", err
@@ -385,7 +385,7 @@ func (c *cmdInit) checkNetwork(d lxd.InstanceServer, name string) {
 		}
 	}
 
-	fmt.Fprintf(os.Stderr, "\n"+i18n.G("The container you are starting doesn't have any network attached to it.")+"\n")
+	fmt.Fprintf(os.Stderr, "\n"+i18n.G("The instance you are starting doesn't have any network attached to it.")+"\n")
 	fmt.Fprintf(os.Stderr, "  "+i18n.G("To create a new network, use: lxc network create")+"\n")
-	fmt.Fprintf(os.Stderr, "  "+i18n.G("To attach a network to a container, use: lxc network attach")+"\n\n")
+	fmt.Fprintf(os.Stderr, "  "+i18n.G("To attach a network to an instance, use: lxc network attach")+"\n\n")
 }
diff --git a/lxc/launch.go b/lxc/launch.go
index 54301947c7..03ca8f2b9f 100644
--- a/lxc/launch.go
+++ b/lxc/launch.go
@@ -19,14 +19,14 @@ type cmdLaunch struct {
 func (c *cmdLaunch) Command() *cobra.Command {
 	cmd := c.init.Command()
 	cmd.Use = i18n.G("launch [<remote>:]<image> [<remote>:][<name>]")
-	cmd.Short = i18n.G("Create and start containers from images")
+	cmd.Short = i18n.G("Create and start instances from images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Create and start containers from images`))
+		`Create and start instances from images`))
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc launch ubuntu:16.04 u1
 
 lxc launch ubuntu:16.04 u1 < config.yaml
-    Create and start the container with configuration from config.yaml`))
+    Create and start the instance with configuration from config.yaml`))
 	cmd.Hidden = false
 
 	cmd.RunE = c.Run
@@ -63,7 +63,7 @@ func (c *cmdLaunch) Run(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	// Start the container
+	// Start the instance
 	if !c.global.flagQuiet {
 		fmt.Printf(i18n.G("Starting %s")+"\n", name)
 	}
diff --git a/lxc/list.go b/lxc/list.go
index e3eb70a3df..5ad36c8161 100644
--- a/lxc/list.go
+++ b/lxc/list.go
@@ -40,33 +40,33 @@ func (c *cmdList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("list [<remote>:] [<filter>...]")
 	cmd.Aliases = []string{"ls"}
-	cmd.Short = i18n.G("List containers")
+	cmd.Short = i18n.G("List instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`List containers
+		`List instances
 
 Default column layout: ns46tS
 Fast column layout: nsacPt
 
 == Filters ==
-A single keyword like "web" which will list any container with a name starting by "web".
-A regular expression on the container name. (e.g. .*web.*01$).
+A single keyword like "web" which will list any instance with a name starting by "web".
+A regular expression on the instance name. (e.g. .*web.*01$).
 A key/value pair referring to a configuration item. For those, the
 namespace can be abbreviated to the smallest unambiguous identifier.
 
 Examples:
-  - "user.blah=abc" will list all containers with the "blah" user property set to "abc".
+  - "user.blah=abc" will list all instances with the "blah" user property set to "abc".
   - "u.blah=abc" will do the same
-  - "security.privileged=true" will list all privileged containers
+  - "security.privileged=true" will list all privileged instances
   - "s.privileged=true" will do the same
 
 A regular expression matching a configuration item or its value. (e.g. volatile.eth0.hwaddr=00:16:3e:.*).
 
 When multiple filters are passed, they are added one on top of the other,
-selecting containers which satisfy them all.
+selecting instances which satisfy them all.
 
 == Columns ==
 The -c option takes a comma separated list of arguments that control
-which container attributes to output when displaying in table or csv
+which instance attributes to output when displaying in table or csv
 format.
 
 Column arguments are either pre-defined shorthand chars (see below),
@@ -84,12 +84,12 @@ Pre-defined column shorthand chars:
   l - Last used date
   n - Name
   N - Number of Processes
-  p - PID of the container's init process
+  p - PID of the instance's init process
   P - Profiles
   s - State
   S - Number of snapshots
   t - Type (persistent or ephemeral)
-  L - Location of the container (e.g. its cluster member)
+  L - Location of the instance (e.g. its cluster member)
   f - Base Image Fingerprint (short)
   F - Base Image Fingerprint (long)
 
@@ -103,8 +103,8 @@ Custom columns are defined with "[config:|devices:]key[:name][:maxWidth]":
 
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0.parent:ETHP
-  Show containers using the "NAME", "BASE IMAGE", "STATE", "IPV4", "IPV6" and "MAC" columns.
-  "BASE IMAGE", "MAC" and "IMAGE OS" are custom columns generated from container configuration keys.
+  Show instances using the "NAME", "BASE IMAGE", "STATE", "IPV4", "IPV6" and "MAC" columns.
+  "BASE IMAGE", "MAC" and "IMAGE OS" are custom columns generated from instance configuration keys.
   "ETHP" is a custom column generated from a device key.
 
 lxc list -c ns,user.comment:comment
@@ -205,7 +205,7 @@ func (c *cmdList) shouldShow(filters []string, state *api.Instance) bool {
 	return true
 }
 
-func (c *cmdList) listContainers(conf *config.Config, d lxd.InstanceServer, cinfos []api.Instance, filters []string, columns []column) error {
+func (c *cmdList) listInstances(conf *config.Config, d lxd.InstanceServer, cinfos []api.Instance, filters []string, columns []column) error {
 	threads := 10
 	if len(cinfos) < threads {
 		threads = len(cinfos)
@@ -310,10 +310,10 @@ func (c *cmdList) listContainers(conf *config.Config, d lxd.InstanceServer, cinf
 		data[i].Snapshots = cSnapshots[cinfos[i].Name]
 	}
 
-	return c.showContainers(data, filters, columns)
+	return c.showInstances(data, filters, columns)
 }
 
-func (c *cmdList) showContainers(cts []api.InstanceFull, filters []string, columns []column) error {
+func (c *cmdList) showInstances(cts []api.InstanceFull, filters []string, columns []column) error {
 	// Generate the table data
 	data := [][]string{}
 	for _, ct := range cts {
@@ -393,10 +393,10 @@ func (c *cmdList) Run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		return c.showContainers(cts, filters, columns)
+		return c.showInstances(cts, filters, columns)
 	}
 
-	// Get the list of containers
+	// Get the list of instances
 	var cts []api.Instance
 	ctslist, err := d.GetInstances(api.InstanceTypeAny)
 	if err != nil {
@@ -413,7 +413,7 @@ func (c *cmdList) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Fetch any remaining data and render the table
-	return c.listContainers(conf, d, cts, filters, columns)
+	return c.listInstances(conf, d, cts, filters, columns)
 }
 
 func (c *cmdList) parseColumns(clustered bool) ([]column, bool, error) {
diff --git a/lxc/main.go b/lxc/main.go
index b0eed20ef0..b8df8706c7 100644
--- a/lxc/main.go
+++ b/lxc/main.go
@@ -240,7 +240,7 @@ For help with any of those, simply call them with --help.`))
 		// Handle non-Linux systems
 		if err == config.ErrNotLinux {
 			fmt.Fprintf(os.Stderr, i18n.G(`This client hasn't been configured to use a remote LXD server yet.
-As your platform can't run native Linux containers, you must connect to a remote LXD server.
+As your platform can't run native Linux instances, you must connect to a remote LXD server.
 
 If you already added a remote server, make it the default with "lxc remote switch NAME".
 To easily setup a local LXD server in a virtual machine, consider using: https://multipass.run`)+"\n")
@@ -342,7 +342,7 @@ func (c *cmdGlobal) PreRun(cmd *cobra.Command, args []string) error {
 		}
 
 		if !shared.StringInSlice(cmd.Name(), []string{"init", "launch"}) {
-			fmt.Fprintf(os.Stderr, i18n.G("To start your first container, try: lxc launch ubuntu:18.04")+"\n")
+			fmt.Fprintf(os.Stderr, i18n.G("To start your first instance, try: lxc launch ubuntu:18.04")+"\n")
 			flush = true
 		}
 
diff --git a/lxc/move.go b/lxc/move.go
index 257dfcda61..3a5e836353 100644
--- a/lxc/move.go
+++ b/lxc/move.go
@@ -31,30 +31,30 @@ type cmdMove struct {
 
 func (c *cmdMove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/<snapshot>]]")
+	cmd.Use = i18n.G("move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]")
 	cmd.Aliases = []string{"mv"}
-	cmd.Short = i18n.G("Move containers within or in between LXD servers")
+	cmd.Short = i18n.G("Move instances within or in between LXD servers")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Move containers within or in between LXD servers`))
+		`Move instances within or in between LXD servers`))
 	cmd.Example = cli.FormatSection("", i18n.G(
-		`lxc move [<remote>:]<source container> [<remote>:][<destination container>] [--container-only]
-    Move a container between two hosts, renaming it if destination name differs.
+		`lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--instance-only]
+    Move an instance between two hosts, renaming it if destination name differs.
 
-lxc move <old name> <new name> [--container-only]
-    Rename a local container.
+lxc move <old name> <new name> [--instance-only]
+    Rename a local instance.
 
-lxc move <container>/<old snapshot name> <container>/<new snapshot name>
+lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>
     Rename a snapshot.`))
 
 	cmd.RunE = c.Run
-	cmd.Flags().StringArrayVarP(&c.flagConfig, "config", "c", nil, i18n.G("Config key/value to apply to the target container")+"``")
+	cmd.Flags().StringArrayVarP(&c.flagConfig, "config", "c", nil, i18n.G("Config key/value to apply to the target instance")+"``")
 	cmd.Flags().StringArrayVarP(&c.flagDevice, "device", "d", nil, i18n.G("New key/value to apply to a specific device")+"``")
-	cmd.Flags().StringArrayVarP(&c.flagProfile, "profile", "p", nil, i18n.G("Profile to apply to the target container")+"``")
-	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Unset all profiles on the target container"))
-	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false, i18n.G("Move the container without its snapshots (deprecated, use instance-only)"))
+	cmd.Flags().StringArrayVarP(&c.flagProfile, "profile", "p", nil, i18n.G("Profile to apply to the target instance")+"``")
+	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Unset all profiles on the target instance"))
+	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false, i18n.G("Move the instance without its snapshots (deprecated, use instance-only)"))
 	cmd.Flags().BoolVar(&c.flagInstanceOnly, "instance-only", false, i18n.G("Move the instance without its snapshots"))
 	cmd.Flags().StringVar(&c.flagMode, "mode", moveDefaultMode, i18n.G("Transfer mode. One of pull (default), push or relay.")+"``")
-	cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Copy a stateful container stateless"))
+	cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Copy a stateful instance stateless"))
 	cmd.Flags().StringVarP(&c.flagStorage, "storage", "s", "", i18n.G("Storage pool name")+"``")
 	cmd.Flags().StringVar(&c.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
 	cmd.Flags().StringVar(&c.flagTargetProject, "target-project", "", i18n.G("Copy to a project different from the source")+"``")
@@ -100,8 +100,8 @@ func (c *cmdMove) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// As an optimization, if the source an destination are the same, do
-	// this via a simple rename. This only works for containers that aren't
-	// running, containers that are running should be live migrated (of
+	// this via a simple rename. This only works for instances that aren't
+	// running, instances that are running should be live migrated (of
 	// course, this changing of hostname isn't supported right now, so this
 	// simply won't work).
 	if sourceRemote == destRemote && c.flagTarget == "" && c.flagStorage == "" && c.flagTargetProject == "" {
@@ -150,7 +150,7 @@ func (c *cmdMove) Run(cmd *cobra.Command, args []string) error {
 		destResource = args[1]
 	}
 
-	// If the target option was specified, we're moving a container from a
+	// If the target option was specified, we're moving an instance from a
 	// cluster member to another, let's use the dedicated API.
 	if c.flagTarget != "" {
 		if c.flagStateless {
@@ -158,7 +158,7 @@ func (c *cmdMove) Run(cmd *cobra.Command, args []string) error {
 		}
 
 		if c.flagContainerOnly {
-			return fmt.Errorf(i18n.G("The --container-only flag can't be used with --target"))
+			return fmt.Errorf(i18n.G("The --instance-only flag can't be used with --target"))
 		}
 
 		if c.flagInstanceOnly {
@@ -169,7 +169,7 @@ func (c *cmdMove) Run(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf(i18n.G("The --mode flag can't be used with --target"))
 		}
 
-		return moveClusterContainer(conf, sourceResource, destResource, c.flagTarget)
+		return moveClusterInstance(conf, sourceResource, destResource, c.flagTarget)
 	}
 
 	cpy := cmdCopy{}
@@ -185,8 +185,8 @@ func (c *cmdMove) Run(cmd *cobra.Command, args []string) error {
 	instanceOnly := c.flagContainerOnly || c.flagInstanceOnly
 
 	// A move is just a copy followed by a delete; however, we want to
-	// keep the volatile entries around since we are moving the container.
-	err = cpy.copyContainer(conf, sourceResource, destResource, true, -1, stateful, instanceOnly, mode, c.flagStorage, true)
+	// keep the volatile entries around since we are moving the instance.
+	err = cpy.copyInstance(conf, sourceResource, destResource, true, -1, stateful, instanceOnly, mode, c.flagStorage, true)
 	if err != nil {
 		return err
 	}
@@ -195,14 +195,14 @@ func (c *cmdMove) Run(cmd *cobra.Command, args []string) error {
 	del.flagForce = true
 	err = del.Run(cmd, args[:1])
 	if err != nil {
-		return errors.Wrap(err, "Failed to delete original container after copying it")
+		return errors.Wrap(err, "Failed to delete original instance after copying it")
 	}
 
 	return nil
 }
 
-// Move a container using special POST /containers/<name>?target=<member> API.
-func moveClusterContainer(conf *config.Config, sourceResource, destResource, target string) error {
+// Move an instance using special POST /instances/<name>?target=<member> API.
+func moveClusterInstance(conf *config.Config, sourceResource, destResource, target string) error {
 	// Parse the source.
 	sourceRemote, sourceName, err := conf.ParseRemote(sourceResource)
 	if err != nil {
@@ -215,9 +215,9 @@ func moveClusterContainer(conf *config.Config, sourceResource, destResource, tar
 		return err
 	}
 
-	// Make sure we have a container or snapshot name.
+	// Make sure we have an instance or snapshot name.
 	if sourceName == "" {
-		return fmt.Errorf(i18n.G("You must specify a source container name"))
+		return fmt.Errorf(i18n.G("You must specify a source instance name"))
 	}
 
 	// The destination name is optional.
@@ -252,5 +252,5 @@ func moveClusterContainer(conf *config.Config, sourceResource, destResource, tar
 	return nil
 }
 
-// Default migration mode when moving a container.
+// Default migration mode when moving an instance.
 const moveDefaultMode = "pull"
diff --git a/lxc/network.go b/lxc/network.go
index b3695c8a62..c6d578ee9c 100644
--- a/lxc/network.go
+++ b/lxc/network.go
@@ -28,9 +28,9 @@ type cmdNetwork struct {
 func (c *cmdNetwork) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("network")
-	cmd.Short = i18n.G("Manage and attach containers to networks")
+	cmd.Short = i18n.G("Manage and attach instances to networks")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Manage and attach containers to networks`))
+		`Manage and attach instances to networks`))
 
 	// Attach
 	networkAttachCmd := cmdNetworkAttach{global: c.global, network: c}
@@ -103,10 +103,10 @@ type cmdNetworkAttach struct {
 
 func (c *cmdNetworkAttach) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("attach [<remote>:]<network> <container> [<device name>] [<interface name>]")
-	cmd.Short = i18n.G("Attach network interfaces to containers")
+	cmd.Use = i18n.G("attach [<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 containers`))
+		`Attach new network interfaces to instances`))
 
 	cmd.RunE = c.Run
 
@@ -144,7 +144,7 @@ func (c *cmdNetworkAttach) Run(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	// Prepare the container's device entry
+	// Prepare the instance's device entry
 	device := map[string]string{
 		"type":    "nic",
 		"nictype": "macvlan",
@@ -159,8 +159,8 @@ func (c *cmdNetworkAttach) Run(cmd *cobra.Command, args []string) error {
 		device["name"] = args[3]
 	}
 
-	// Add the device to the container
-	err = containerDeviceAdd(resource.server, args[1], devName, device)
+	// Add the device to the instance
+	err = instanceDeviceAdd(resource.server, args[1], devName, device)
 	if err != nil {
 		return err
 	}
@@ -371,10 +371,10 @@ type cmdNetworkDetach struct {
 
 func (c *cmdNetworkDetach) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("detach [<remote>:]<network> <container> [<device name>]")
-	cmd.Short = i18n.G("Detach network interfaces from containers")
+	cmd.Use = i18n.G("detach [<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 containers`))
+		`Detach network interfaces from instances`))
 
 	cmd.RunE = c.Run
 
@@ -406,15 +406,15 @@ func (c *cmdNetworkDetach) Run(cmd *cobra.Command, args []string) error {
 		devName = args[2]
 	}
 
-	// Get the container entry
-	container, etag, err := resource.server.GetInstance(args[1])
+	// Get the instance entry
+	inst, etag, err := resource.server.GetInstance(args[1])
 	if err != nil {
 		return err
 	}
 
 	// Find the device
 	if devName == "" {
-		for n, d := range container.Devices {
+		for n, d := range inst.Devices {
 			if d["type"] == "nic" && d["parent"] == resource.name {
 				if devName != "" {
 					return fmt.Errorf(i18n.G("More than one device matches, specify the device name"))
@@ -429,7 +429,7 @@ func (c *cmdNetworkDetach) Run(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf(i18n.G("No device found for this network"))
 	}
 
-	device, ok := container.Devices[devName]
+	device, ok := inst.Devices[devName]
 	if !ok {
 		return fmt.Errorf(i18n.G("The specified device doesn't exist"))
 	}
@@ -439,8 +439,8 @@ func (c *cmdNetworkDetach) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Remove the device
-	delete(container.Devices, devName)
-	op, err := resource.server.UpdateInstance(args[1], container.Writable(), etag)
+	delete(inst.Devices, devName)
+	op, err := resource.server.UpdateInstance(args[1], inst.Writable(), etag)
 	if err != nil {
 		return err
 	}
@@ -456,7 +456,7 @@ type cmdNetworkDetachProfile struct {
 
 func (c *cmdNetworkDetachProfile) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("detach-profile [<remote>:]<network> <container> [<device name>]")
+	cmd.Use = i18n.G("detach-profile [<remote>:]<network> <instance> [<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`))
diff --git a/lxc/profile.go b/lxc/profile.go
index 75e8d68d1b..9d507ae099 100644
--- a/lxc/profile.go
+++ b/lxc/profile.go
@@ -96,10 +96,10 @@ type cmdProfileAdd struct {
 
 func (c *cmdProfileAdd) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("add [<remote>:]<container> <profile>")
-	cmd.Short = i18n.G("Add profiles to containers")
+	cmd.Use = i18n.G("add [<remote>:]<instance> <profile>")
+	cmd.Short = i18n.G("Add profiles to instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Add profiles to containers`))
+		`Add profiles to instances`))
 
 	cmd.RunE = c.Run
 
@@ -122,18 +122,18 @@ func (c *cmdProfileAdd) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container.name name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
 	// Add the profile
-	container, etag, err := resource.server.GetInstance(resource.name)
+	inst, etag, err := resource.server.GetInstance(resource.name)
 	if err != nil {
 		return err
 	}
 
-	container.Profiles = append(container.Profiles, args[1])
+	inst.Profiles = append(inst.Profiles, args[1])
 
-	op, err := resource.server.UpdateInstance(resource.name, container.Writable(), etag)
+	op, err := resource.server.UpdateInstance(resource.name, inst.Writable(), etag)
 	if err != nil {
 		return err
 	}
@@ -158,11 +158,11 @@ type cmdProfileAssign struct {
 
 func (c *cmdProfileAssign) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("assign [<remote>:]<container> <profiles>")
+	cmd.Use = i18n.G("assign [<remote>:]<instance> <profiles>")
 	cmd.Aliases = []string{"apply"}
-	cmd.Short = i18n.G("Assign sets of profiles to containers")
+	cmd.Short = i18n.G("Assign sets of profiles to instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Assign sets of profiles to containers`))
+		`Assign sets of profiles to instances`))
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc profile assign foo default,bar
     Set the profiles for "foo" to "default" and "bar".
@@ -195,21 +195,21 @@ func (c *cmdProfileAssign) Run(cmd *cobra.Command, args []string) error {
 
 	// Assign the profiles
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
-	container, etag, err := resource.server.GetInstance(resource.name)
+	inst, etag, err := resource.server.GetInstance(resource.name)
 	if err != nil {
 		return err
 	}
 
 	if args[1] != "" {
-		container.Profiles = strings.Split(args[1], ",")
+		inst.Profiles = strings.Split(args[1], ",")
 	} else {
-		container.Profiles = nil
+		inst.Profiles = nil
 	}
 
-	op, err := resource.server.UpdateInstance(resource.name, container.Writable(), etag)
+	op, err := resource.server.UpdateInstance(resource.name, inst.Writable(), etag)
 	if err != nil {
 		return err
 	}
@@ -631,10 +631,10 @@ type cmdProfileRemove struct {
 
 func (c *cmdProfileRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remove [<remote>:]<container> <profile>")
-	cmd.Short = i18n.G("Remove profiles from containers")
+	cmd.Use = i18n.G("remove [<remote>:]<instance> <profile>")
+	cmd.Short = i18n.G("Remove profiles from instances")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Remove profiles from containers`))
+		`Remove profiles from instances`))
 
 	cmd.RunE = c.Run
 
@@ -657,21 +657,21 @@ func (c *cmdProfileRemove) Run(cmd *cobra.Command, args []string) error {
 	resource := resources[0]
 
 	if resource.name == "" {
-		return fmt.Errorf(i18n.G("Missing container name"))
+		return fmt.Errorf(i18n.G("Missing instance name"))
 	}
 
 	// Remove the profile
-	container, etag, err := resource.server.GetInstance(resource.name)
+	inst, etag, err := resource.server.GetInstance(resource.name)
 	if err != nil {
 		return err
 	}
 
-	if !shared.StringInSlice(args[1], container.Profiles) {
+	if !shared.StringInSlice(args[1], inst.Profiles) {
 		return fmt.Errorf(i18n.G("Profile %s isn't currently applied to %s"), args[1], resource.name)
 	}
 
 	profiles := []string{}
-	for _, profile := range container.Profiles {
+	for _, profile := range inst.Profiles {
 		if profile == args[1] {
 			continue
 		}
@@ -679,9 +679,9 @@ func (c *cmdProfileRemove) Run(cmd *cobra.Command, args []string) error {
 		profiles = append(profiles, profile)
 	}
 
-	container.Profiles = profiles
+	inst.Profiles = profiles
 
-	op, err := resource.server.UpdateInstance(resource.name, container.Writable(), etag)
+	op, err := resource.server.UpdateInstance(resource.name, inst.Writable(), etag)
 	if err != nil {
 		return err
 	}
diff --git a/lxc/publish.go b/lxc/publish.go
index d7fa238d3c..102e3921de 100644
--- a/lxc/publish.go
+++ b/lxc/publish.go
@@ -30,15 +30,15 @@ func (c *cmdPublish) showByDefault() bool {
 
 func (c *cmdPublish) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] [key=value...]")
-	cmd.Short = i18n.G("Publish containers as images")
+	cmd.Use = i18n.G("publish [<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 containers as images`))
+		`Publish instances as images`))
 
 	cmd.RunE = c.Run
 	cmd.Flags().BoolVar(&c.flagMakePublic, "public", false, i18n.G("Make the image public"))
 	cmd.Flags().StringArrayVar(&c.flagAliases, "alias", nil, i18n.G("New alias to define at target")+"``")
-	cmd.Flags().BoolVarP(&c.flagForce, "force", "f", false, i18n.G("Stop the container if currently running"))
+	cmd.Flags().BoolVarP(&c.flagForce, "force", "f", false, i18n.G("Stop the instance if currently running"))
 	cmd.Flags().StringVar(&c.flagCompressionAlgorithm, "compression", "", i18n.G("Define a compression algorithm: for image or none")+"``")
 
 	return cmd
@@ -77,7 +77,7 @@ func (c *cmdPublish) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	if cName == "" {
-		return fmt.Errorf(i18n.G("Container name is mandatory"))
+		return fmt.Errorf(i18n.G("Instance name is mandatory"))
 	}
 	if iName != "" {
 		return fmt.Errorf(i18n.G("There is no \"image name\".  Did you want an alias?"))
@@ -107,7 +107,7 @@ func (c *cmdPublish) Run(cmd *cobra.Command, args []string) error {
 
 		if wasRunning {
 			if !c.flagForce {
-				return fmt.Errorf(i18n.G("The container is currently running. Use --force to have it stopped and restarted"))
+				return fmt.Errorf(i18n.G("The instance is currently running. Use --force to have it stopped and restarted"))
 			}
 
 			if ct.Ephemeral {
@@ -142,7 +142,7 @@ func (c *cmdPublish) Run(cmd *cobra.Command, args []string) error {
 
 			err = op.Wait()
 			if err != nil {
-				return fmt.Errorf(i18n.G("Stopping container failed!"))
+				return fmt.Errorf(i18n.G("Stopping instance failed!"))
 			}
 
 			defer func() {
@@ -219,7 +219,7 @@ func (c *cmdPublish) Run(cmd *cobra.Command, args []string) error {
 
 	// Watch the background operation
 	progress := utils.ProgressRenderer{
-		Format: i18n.G("Publishing container: %s"),
+		Format: i18n.G("Publishing instance: %s"),
 		Quiet:  c.global.flagQuiet,
 	}
 
@@ -273,7 +273,7 @@ func (c *cmdPublish) Run(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf(i18n.G("Container published with fingerprint: %s")+"\n", fingerprint)
+	fmt.Printf(i18n.G("Instance published with fingerprint: %s")+"\n", fingerprint)
 
 	return nil
 }
diff --git a/lxc/query.go b/lxc/query.go
index 4cce83d90b..084941e2a6 100644
--- a/lxc/query.go
+++ b/lxc/query.go
@@ -31,8 +31,8 @@ func (c *cmdQuery) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Send a raw query to LXD`))
 	cmd.Example = cli.FormatSection("", i18n.G(
-		`lxc query -X DELETE --wait /1.0/containers/c1
-    Delete local container "c1".`))
+		`lxc query -X DELETE --wait /1.0/instances/c1
+    Delete local instance "c1".`))
 	cmd.Hidden = true
 
 	cmd.RunE = c.Run
diff --git a/lxc/rename.go b/lxc/rename.go
index 9ef9287acb..abe6c1f785 100644
--- a/lxc/rename.go
+++ b/lxc/rename.go
@@ -16,10 +16,10 @@ type cmdRename struct {
 
 func (c *cmdRename) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]")
-	cmd.Short = i18n.G("Rename containers and snapshots")
+	cmd.Use = i18n.G("rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]")
+	cmd.Short = i18n.G("Rename instances and snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Rename containers and snapshots`))
+		`Rename instances and snapshots`))
 	cmd.RunE = c.Run
 
 	return cmd
diff --git a/lxc/restore.go b/lxc/restore.go
index c054e52db7..82da4038a0 100644
--- a/lxc/restore.go
+++ b/lxc/restore.go
@@ -19,10 +19,10 @@ type cmdRestore struct {
 
 func (c *cmdRestore) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("restore [<remote>:]<container> <snapshot>")
-	cmd.Short = i18n.G("Restore containers from snapshots")
+	cmd.Use = i18n.G("restore [<remote>:]<instance> <snapshot>")
+	cmd.Short = i18n.G("Restore instances from snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Restore containers from snapshots
+		`Restore instaces from snapshots
 
 If --stateful is passed, then the running state will be restored too.`))
 	cmd.Example = cli.FormatSection("", i18n.G(
@@ -33,7 +33,7 @@ lxc restore u1 snap0
     Restore the snapshot.`))
 
 	cmd.RunE = c.Run
-	cmd.Flags().BoolVar(&c.flagStateful, "stateful", false, i18n.G("Whether or not to restore the container's running state from snapshot (if available)"))
+	cmd.Flags().BoolVar(&c.flagStateful, "stateful", false, i18n.G("Whether or not to restore the instance's running state from snapshot (if available)"))
 
 	return cmd
 }
diff --git a/lxc/snapshot.go b/lxc/snapshot.go
index 9ed0b0f02d..5efa8975be 100644
--- a/lxc/snapshot.go
+++ b/lxc/snapshot.go
@@ -19,20 +19,20 @@ type cmdSnapshot struct {
 
 func (c *cmdSnapshot) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("snapshot [<remote>:]<container> [<snapshot name>]")
-	cmd.Short = i18n.G("Create container snapshots")
+	cmd.Use = i18n.G("snapshot [<remote>:]<instance> [<snapshot name>]")
+	cmd.Short = i18n.G("Create instance snapshots")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Create container snapshots
+		`Create instance snapshots
 
-When --stateful is used, LXD attempts to checkpoint the container's
+When --stateful is used, LXD attempts to checkpoint the instance's
 running state, including process memory state, TCP connections, ...`))
 	cmd.Example = cli.FormatSection("", i18n.G(
 		`lxc snapshot u1 snap0
     Create a snapshot of "u1" called "snap0".`))
 
 	cmd.RunE = c.Run
-	cmd.Flags().BoolVar(&c.flagStateful, "stateful", false, i18n.G("Whether or not to snapshot the container's running state"))
-	cmd.Flags().BoolVar(&c.flagNoExpiry, "no-expiry", false, i18n.G("Ignore any configured auto-expiry for the container"))
+	cmd.Flags().BoolVar(&c.flagStateful, "stateful", false, i18n.G("Whether or not to snapshot the instance's running state"))
+	cmd.Flags().BoolVar(&c.flagNoExpiry, "no-expiry", false, i18n.G("Ignore any configured auto-expiry for the instance"))
 
 	return cmd
 }
diff --git a/lxc/storage.go b/lxc/storage.go
index 86de4b2ab7..0125047385 100644
--- a/lxc/storage.go
+++ b/lxc/storage.go
@@ -451,7 +451,7 @@ func (c *cmdStorageInfo) Run(cmd *cobra.Command, args []string) error {
 	poolusedby[usedbystring] = map[string][]string{}
 
 	/* Build up the usedby map
-	/1.0/{containers,images,profiles}/storagepoolname
+	/1.0/{instances,images,profiles}/storagepoolname
 	remove the /1.0/ and build the map based on the resources name as key
 	and resources details as value */
 	for _, v := range pool.UsedBy {
diff --git a/lxc/storage_volume.go b/lxc/storage_volume.go
index baeb9880cb..d9f438a8d2 100644
--- a/lxc/storage_volume.go
+++ b/lxc/storage_volume.go
@@ -134,10 +134,10 @@ type cmdStorageVolumeAttach struct {
 
 func (c *cmdStorageVolumeAttach) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("attach [<remote>:]<pool> <volume> <container> [<device name>] <path>")
-	cmd.Short = i18n.G("Attach new storage volumes to containers")
+	cmd.Use = i18n.G("attach [<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 containers`))
+		`Attach new storage volumes to instances`))
 
 	cmd.RunE = c.Run
 
@@ -178,7 +178,7 @@ func (c *cmdStorageVolumeAttach) Run(cmd *cobra.Command, args []string) error {
 
 	volName, volType := c.storageVolume.parseVolume("custom", args[1])
 	if volType != "custom" {
-		return fmt.Errorf(i18n.G("Only \"custom\" volumes can be attached to containers"))
+		return fmt.Errorf(i18n.G("Only \"custom\" volumes can be attached to instances"))
 	}
 
 	// Check if the requested storage volume actually exists
@@ -187,7 +187,7 @@ func (c *cmdStorageVolumeAttach) Run(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	// Prepare the container's device entry
+	// Prepare the instance's device entry
 	device := map[string]string{
 		"type":   "disk",
 		"pool":   resource.name,
@@ -195,8 +195,8 @@ func (c *cmdStorageVolumeAttach) Run(cmd *cobra.Command, args []string) error {
 		"source": vol.Name,
 	}
 
-	// Add the device to the container
-	err = containerDeviceAdd(resource.server, args[2], devName, device)
+	// Add the device to the instance
+	err = instanceDeviceAdd(resource.server, args[2], devName, device)
 	if err != nil {
 		return err
 	}
@@ -257,7 +257,7 @@ func (c *cmdStorageVolumeAttachProfile) Run(cmd *cobra.Command, args []string) e
 
 	volName, volType := c.storageVolume.parseVolume("custom", args[1])
 	if volType != "custom" {
-		return fmt.Errorf(i18n.G("Only \"custom\" volumes can be attached to containers"))
+		return fmt.Errorf(i18n.G("Only \"custom\" volumes can be attached to instances"))
 	}
 
 	// Check if the requested storage volume actually exists
@@ -266,7 +266,7 @@ func (c *cmdStorageVolumeAttachProfile) Run(cmd *cobra.Command, args []string) e
 		return err
 	}
 
-	// Prepare the container's device entry
+	// Prepare the instance's device entry
 	device := map[string]string{
 		"type":   "disk",
 		"pool":   resource.name,
@@ -274,7 +274,7 @@ func (c *cmdStorageVolumeAttachProfile) Run(cmd *cobra.Command, args []string) e
 		"source": vol.Name,
 	}
 
-	// Add the device to the container
+	// Add the device to the instance
 	err = profileDeviceAdd(resource.server, args[2], devName, device)
 	if err != nil {
 		return err
@@ -610,10 +610,10 @@ type cmdStorageVolumeDetach struct {
 
 func (c *cmdStorageVolumeDetach) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("detach [<remote>:]<pool> <volume> <container> [<device name>]")
-	cmd.Short = i18n.G("Detach storage volumes from containers")
+	cmd.Use = i18n.G("detach [<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 containers`))
+		`Detach storage volumes from instances`))
 
 	cmd.RunE = c.Run
 
@@ -645,15 +645,15 @@ func (c *cmdStorageVolumeDetach) Run(cmd *cobra.Command, args []string) error {
 		devName = args[3]
 	}
 
-	// Get the container entry
-	container, etag, err := resource.server.GetInstance(args[2])
+	// Get the instance entry
+	inst, etag, err := resource.server.GetInstance(args[2])
 	if err != nil {
 		return err
 	}
 
 	// Find the device
 	if devName == "" {
-		for n, d := range container.Devices {
+		for n, d := range inst.Devices {
 			if d["type"] == "disk" && d["pool"] == resource.name && d["source"] == args[1] {
 				if devName != "" {
 					return fmt.Errorf(i18n.G("More than one device matches, specify the device name"))
@@ -668,14 +668,14 @@ func (c *cmdStorageVolumeDetach) Run(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf(i18n.G("No device found for this storage volume"))
 	}
 
-	_, ok := container.Devices[devName]
+	_, ok := inst.Devices[devName]
 	if !ok {
 		return fmt.Errorf(i18n.G("The specified device doesn't exist"))
 	}
 
 	// Remove the device
-	delete(container.Devices, devName)
-	op, err := resource.server.UpdateInstance(args[2], container.Writable(), etag)
+	delete(inst.Devices, devName)
+	op, err := resource.server.UpdateInstance(args[2], inst.Writable(), etag)
 	if err != nil {
 		return err
 	}
diff --git a/lxc/utils.go b/lxc/utils.go
index 533a96b5b3..a34c1bb26e 100644
--- a/lxc/utils.go
+++ b/lxc/utils.go
@@ -117,23 +117,23 @@ func runBatch(names []string, action func(name string) error) []batchResult {
 	return results
 }
 
-// Add a device to a container
-func containerDeviceAdd(client lxd.InstanceServer, name string, devName string, dev map[string]string) error {
-	// Get the container entry
-	container, etag, err := client.GetInstance(name)
+// Add a device to an instance
+func instanceDeviceAdd(client lxd.InstanceServer, name string, devName string, dev map[string]string) error {
+	// Get the instance entry
+	inst, etag, err := client.GetInstance(name)
 	if err != nil {
 		return err
 	}
 
 	// Check if the device already exists
-	_, ok := container.Devices[devName]
+	_, ok := inst.Devices[devName]
 	if ok {
 		return fmt.Errorf(i18n.G("Device already exists: %s"), devName)
 	}
 
-	container.Devices[devName] = dev
+	inst.Devices[devName] = dev
 
-	op, err := client.UpdateInstance(name, container.Writable(), etag)
+	op, err := client.UpdateInstance(name, inst.Writable(), etag)
 	if err != nil {
 		return err
 	}

From b3c8a81cbc6a3a3cb4969f972c98f476105d3534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 13 Jan 2020 14:30:08 -0500
Subject: [PATCH 3/4] lxc/info: Fix VM support
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/info.go | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lxc/info.go b/lxc/info.go
index 493c421e9a..ad076a8869 100644
--- a/lxc/info.go
+++ b/lxc/info.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"io"
 	"io/ioutil"
 	"strings"
 
@@ -589,9 +590,19 @@ func (c *cmdInfo) instanceInfo(d lxd.InstanceServer, remote config.Remote, name
 	}
 
 	if showLog {
-		log, err := d.GetInstanceLogfile(name, "lxc.log")
-		if err != nil {
-			return err
+		var log io.Reader
+		if ct.Type == "container" {
+			log, err = d.GetInstanceLogfile(name, "lxc.log")
+			if err != nil {
+				return err
+			}
+		} else if ct.Type == "virtual-machine" {
+			log, err = d.GetInstanceLogfile(name, "qemu.log")
+			if err != nil {
+				return err
+			}
+		} else {
+			return fmt.Errorf(i18n.G("Unsupported instance type: %s"), ct.Type)
 		}
 
 		stuff, err := ioutil.ReadAll(log)

From 3c48b2421b2612b7b3821f5194f91b504d5f943d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 13 Jan 2020 15:15:08 -0500
Subject: [PATCH 4/4] i18n: Update translation templates
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      |  960 +++++++++++++++++++------------------
 po/de.po      | 1190 ++++++++++++++++++++++++++--------------------
 po/el.po      |  960 +++++++++++++++++++------------------
 po/es.po      | 1117 ++++++++++++++++++++++---------------------
 po/fa.po      |  960 +++++++++++++++++++------------------
 po/fi.po      |  960 +++++++++++++++++++------------------
 po/fr.po      | 1210 +++++++++++++++++++++++++++--------------------
 po/hi.po      |  960 +++++++++++++++++++------------------
 po/id.po      |  960 +++++++++++++++++++------------------
 po/it.po      | 1124 ++++++++++++++++++++++---------------------
 po/ja.po      | 1258 ++++++++++++++++++++++++++++---------------------
 po/ko.po      |  960 +++++++++++++++++++------------------
 po/lxd.pot    |  937 ++++++++++++++++++------------------
 po/nb_NO.po   |  960 +++++++++++++++++++------------------
 po/nl.po      |  987 +++++++++++++++++++-------------------
 po/pa.po      |  960 +++++++++++++++++++------------------
 po/pl.po      |  977 +++++++++++++++++++-------------------
 po/pt_BR.po   | 1101 ++++++++++++++++++++++---------------------
 po/ru.po      | 1138 ++++++++++++++++++++++++--------------------
 po/sl.po      |  960 +++++++++++++++++++------------------
 po/sr.po      |  960 +++++++++++++++++++------------------
 po/sv.po      |  960 +++++++++++++++++++------------------
 po/te.po      |  960 +++++++++++++++++++------------------
 po/tr.po      |  960 +++++++++++++++++++------------------
 po/uk.po      |  960 +++++++++++++++++++------------------
 po/zh_Hans.po |  960 +++++++++++++++++++------------------
 26 files changed, 13488 insertions(+), 12911 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index c9f14f2155..eff480086f 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/de.po b/po/de.po
index d774205d85..1edc4b5f19 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: 2019-09-21 20:27+0000\n"
 "Last-Translator: Joshua Dietz <jospam at dietz-ulm.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -86,7 +86,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -118,10 +118,26 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+"### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
+"### Jede Zeile die mit '# beginnt wird ignoriert.\n"
+"###\n"
+"### Pro Eigenschaft wird eine Zeile verwendet:\n"
+"### Zum Beispiel:\n"
+"###  description: Mein eigenes Abbild"
+
 #: lxc/config_metadata.go:62
 #, fuzzy
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -160,22 +176,6 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-"### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
-"### Jede Zeile die mit '# beginnt wird ignoriert.\n"
-"###\n"
-"### Pro Eigenschaft wird eine Zeile verwendet:\n"
-"### Zum Beispiel:\n"
-"###  description: Mein eigenes Abbild"
-
 #: lxc/network.go:555
 #, fuzzy
 msgid ""
@@ -288,7 +288,7 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -317,38 +317,36 @@ msgstr ""
 msgid "(none)"
 msgstr "(kein Wert)"
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
+msgstr ""
+
 #: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#, fuzzy
+msgid "--refresh can only be used with instances"
 msgstr "--refresh kann nur mit Containern verwendet werden"
 
 #: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
-msgstr ""
-
-#: lxc/info.go:423
+#: lxc/info.go:424
 #, fuzzy
 msgid "--target cannot be used with instances"
 msgstr "--refresh kann nur mit Containern verwendet werden"
@@ -378,7 +376,8 @@ msgid "Action (defaults to GET)"
 msgstr "Aktion (Standard: GET)"
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+#, fuzzy
+msgid "Add devices to instances or profiles"
 msgstr "Geräte zu Containern oder Profilen hinzufügen"
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -408,10 +407,10 @@ msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
 #, fuzzy
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, fuzzy, c-format
 msgid "Address: %s"
 msgstr "Profil %s erstellt\n"
@@ -440,22 +439,24 @@ msgstr "Aliasname fehlt"
 msgid "Aliases:"
 msgstr "Aliasse:\n"
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, fuzzy, c-format
 msgid "Architecture: %s"
 msgstr "Architektur: %s\n"
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, fuzzy, c-format
 msgid "Architecture: %v"
 msgstr "Architektur: %s\n"
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
-msgstr ""
+#, fuzzy
+msgid "Assign sets of profiles to instances"
+msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+#, fuzzy
+msgid "Attach network interfaces to instances"
 msgstr "Netzwerkschnittstellen an Container anbinden"
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -463,12 +464,14 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
-msgstr ""
+#, fuzzy
+msgid "Attach new network interfaces to instances"
+msgstr "Netzwerkschnittstellen an Container anbinden"
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
-msgstr ""
+#, fuzzy
+msgid "Attach new storage volumes to instances"
+msgstr "Netzwerkschnittstellen an Container anbinden"
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
 msgid "Attach new storage volumes to profiles"
@@ -476,14 +479,14 @@ msgstr ""
 
 #: lxc/console.go:31
 #, fuzzy
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -492,7 +495,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -533,19 +536,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, fuzzy, c-format
 msgid "Brand: %v"
 msgstr "Erstellt: %s"
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr "Bytes empfangen"
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr "Bytes gesendet"
 
@@ -557,21 +560,21 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, fuzzy, c-format
 msgid "CPU (%s):"
 msgstr " Prozessorauslastung:"
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 #, fuzzy
 msgid "CPU usage:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -585,7 +588,7 @@ msgstr "ERSTELLT AM"
 msgid "CREATED AT"
 msgstr "ERSTELLT AM"
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -599,7 +602,7 @@ msgstr ""
 "Optionen:\n"
 "\n"
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 #, fuzzy
 msgid "Caches:"
 msgstr ""
@@ -654,12 +657,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, fuzzy, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -684,7 +687,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -719,7 +722,7 @@ msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
 #, fuzzy
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/project.go:88
@@ -729,7 +732,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/move.go:50
 #, fuzzy
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -743,33 +746,19 @@ msgstr "YAML Analyse Fehler %v\n"
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, fuzzy, c-format
-msgid "Container published with fingerprint: %s"
-msgstr "Abbild mit Fingerabdruck %s importiert\n"
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "Kopiere Aliasse von der Quelle"
 
-#: lxc/copy.go:40 lxc/copy.go:41
-#, fuzzy
-msgid "Copy containers within or in between LXD instances"
-msgstr "Herunterfahren des Containers erzwingen."
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -782,6 +771,11 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+#, fuzzy
+msgid "Copy instances within or in between LXD servers"
+msgstr "Herunterfahren des Containers erzwingen."
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -795,15 +789,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/copy.go:51
+#: lxc/copy.go:50
 #, fuzzy
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
+msgid "Copy the instance without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/copy.go:50
+#: lxc/copy.go:51
 #, fuzzy
-msgid "Copy the instance without its snapshots"
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/storage_volume.go:306
@@ -829,12 +822,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, fuzzy, c-format
 msgid "Core %d"
 msgstr "Fehler: %v\n"
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 #, fuzzy
 msgid "Cores:"
 msgstr "Fehler: %v\n"
@@ -843,18 +836,24 @@ msgstr "Fehler: %v\n"
 msgid "Could not create server cert dir"
 msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 
+#: lxc/init.go:57
+#, fuzzy
+msgid "Create a virtual machine"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
 #, fuzzy
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
-msgstr ""
+#, fuzzy
+msgid "Create and start instances from images"
+msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
@@ -862,30 +861,30 @@ msgstr ""
 
 #: lxc/snapshot.go:23
 #, fuzzy
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
 #, fuzzy
-msgid "Create containers from images"
+msgid "Create instances from images"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 #, fuzzy
-msgid "Create new container file templates"
+msgid "Create new custom storage volumes"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/storage_volume.go:461 lxc/storage_volume.go:462
+#: lxc/config_template.go:65 lxc/config_template.go:66
 #, fuzzy
-msgid "Create new custom storage volumes"
+msgid "Create new instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/network.go:253 lxc/network.go:254
@@ -909,14 +908,10 @@ msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/copy.go:56 lxc/init.go:55
 #, fuzzy
-msgid "Create the container with no profiles applied"
+msgid "Create the instance with no profiles applied"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/init.go:57
-msgid "Create virtual machine"
-msgstr ""
-
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr "Erstellt: %s"
@@ -931,7 +926,7 @@ msgstr "Erstelle %s"
 msgid "Creating the instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -949,7 +944,7 @@ msgstr "BESCHREIBUNG"
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -965,19 +960,10 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-#, fuzzy
-msgid "Delete container file templates"
-msgstr "Anhalten des Containers fehlgeschlagen!"
-
-#: lxc/delete.go:29 lxc/delete.go:30
-#, fuzzy
-msgid "Delete containers and snapshots"
-msgstr "Herunterfahren des Containers erzwingen."
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
-msgstr ""
+#, fuzzy
+msgid "Delete files in instances"
+msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
 msgid "Delete image aliases"
@@ -987,6 +973,16 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+#, fuzzy
+msgid "Delete instance file templates"
+msgstr "Anhalten des Containers fehlgeschlagen!"
+
+#: lxc/delete.go:29 lxc/delete.go:30
+#, fuzzy
+msgid "Delete instances and snapshots"
+msgstr "Herunterfahren des Containers erzwingen."
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -1030,7 +1026,7 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -1062,16 +1058,18 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
-msgstr ""
+#, fuzzy
+msgid "Detach network interfaces from instances"
+msgstr "Netzwerkschnittstellen an Container anbinden"
 
 #: lxc/network.go:460 lxc/network.go:461
 msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
-msgstr ""
+#, fuzzy
+msgid "Detach storage volumes from instances"
+msgstr "Profil %s erstellt\n"
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
 msgid "Detach storage volumes from profiles"
@@ -1097,7 +1095,7 @@ msgstr "Gerät %s wurde von %s entfernt\n"
 msgid "Device already exists: %s"
 msgstr "entfernte Instanz %s existiert bereits"
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, fuzzy, c-format
 msgid "Device: %s"
 msgstr ""
@@ -1128,22 +1126,22 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, fuzzy, c-format
 msgid "Disk %d:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 #, fuzzy
 msgid "Disk usage:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 #, fuzzy
 msgid "Disk:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 #, fuzzy
 msgid "Disks:"
 msgstr " Prozessorauslastung:"
@@ -1156,7 +1154,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1175,27 +1173,29 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/file.go:153 lxc/file.go:154
+#, fuzzy
+msgid "Edit files in instances"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 #, fuzzy
-msgid "Edit container file templates"
+msgid "Edit instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
-msgstr ""
+#, fuzzy
+msgid "Edit instance metadata files"
+msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
-msgstr ""
-
-#: lxc/file.go:153 lxc/file.go:154
 #, fuzzy
-msgid "Edit files in containers"
-msgstr "kann nicht zum selben Container Namen kopieren"
-
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
-msgstr ""
+msgid "Edit instance or server configurations as YAML"
+msgstr "Alternatives config Verzeichnis."
 
 #: lxc/network.go:545 lxc/network.go:546
 msgid "Edit network configurations as YAML"
@@ -1223,14 +1223,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1246,7 +1246,8 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+#, fuzzy
+msgid "Ephemeral instance"
 msgstr "Flüchtiger Container"
 
 #: lxc/config_template.go:203
@@ -1259,20 +1260,20 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 #, fuzzy
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1303,12 +1304,12 @@ msgstr ""
 
 #: lxc/export.go:32
 #, fuzzy
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/export.go:33
 #, fuzzy
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/export.go:120
@@ -1381,11 +1382,11 @@ msgstr ""
 
 #: lxc/action.go:120
 #, fuzzy
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1400,12 +1401,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1424,26 +1425,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1461,12 +1462,14 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Get values for instance device configuration keys"
+msgstr "Profil %s erstellt\n"
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Get values for instance or server configuration keys"
+msgstr "Profil %s erstellt\n"
 
 #: lxc/network.go:668 lxc/network.go:669
 msgid "Get values for network configuration keys"
@@ -1497,7 +1500,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1505,12 +1508,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1542,12 +1545,12 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
 #, fuzzy
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/image.go:1326
@@ -1581,14 +1584,9 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
-#: lxc/import.go:27
-#, fuzzy
-msgid "Import container backups"
-msgstr "Herunterfahren des Containers erzwingen."
-
 #: lxc/image.go:605
 msgid ""
 "Import image into the image store\n"
@@ -1600,12 +1598,17 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+#, fuzzy
+msgid "Import instance backups"
+msgstr "Herunterfahren des Containers erzwingen."
+
 #: lxc/import.go:72
 #, fuzzy, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1613,11 +1616,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, fuzzy, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr "Abbild mit Fingerabdruck %s importiert\n"
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1688,11 +1700,11 @@ msgstr "Ungültige Quelle %s"
 msgid "Invalid target %s"
 msgstr "Ungültiges Ziel %s"
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, fuzzy, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1731,12 +1743,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, fuzzy, c-format
 msgid "Link detected: %v"
 msgstr "Architektur: %s\n"
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1766,52 +1778,94 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
 #, fuzzy
-msgid "List container devices"
+msgid "List instance devices"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
 #, fuzzy
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/list.go:43
 #, fuzzy
-msgid "List containers"
+msgid "List instances"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/list.go:44
 #, fuzzy
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1829,12 +1883,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1863,48 +1917,6 @@ msgstr ""
 "* \"security.privileged=1\" listet alle privilegierten Container\n"
 "* \"s.privileged=1\" ebenfalls\n"
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1930,12 +1942,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1948,7 +1960,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, fuzzy, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1980,7 +1992,7 @@ msgid "Make the image public"
 msgstr "Veröffentliche Abbild"
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1992,27 +2004,9 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr "Unbekannter Befehl %s für Abbild"
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-#, fuzzy
-msgid "Manage container devices"
-msgstr "kann nicht zum selben Container Namen kopieren"
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-#, fuzzy
-msgid "Manage container file templates"
-msgstr "Anhalten des Containers fehlgeschlagen!"
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -2029,8 +2023,8 @@ msgstr "Veröffentliche Abbild"
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -2044,6 +2038,26 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+#, fuzzy
+msgid "Manage instance and server configuration options"
+msgstr "Alternatives config Verzeichnis."
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage instance devices"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+#, fuzzy
+msgid "Manage instance file templates"
+msgstr "Anhalten des Containers fehlgeschlagen!"
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#, fuzzy
+msgid "Manage instance metadata files"
+msgstr "Anhalten des Containers fehlgeschlagen!"
+
 #: lxc/profile.go:28 lxc/profile.go:29
 #, fuzzy
 msgid "Manage profiles"
@@ -2080,7 +2094,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -2095,19 +2109,19 @@ msgstr "Gerät %s wurde von %s entfernt\n"
 msgid "Member %s renamed to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -2126,14 +2140,10 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
 #, fuzzy
-msgid "Missing container name"
-msgstr "der Name des Ursprung Containers muss angegeben werden"
-
-#: lxc/profile.go:125
-#, fuzzy
-msgid "Missing container.name name"
+msgid "Missing instance name"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -2187,12 +2197,12 @@ msgstr "Kein Zertifikat für diese Verbindung"
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -2220,7 +2230,7 @@ msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
 #, fuzzy
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
@@ -2228,15 +2238,14 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Move storage volumes between pools"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/move.go:54
+#: lxc/move.go:55
 #, fuzzy
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/move.go:55
+#: lxc/move.go:54
 #, fuzzy
-msgid "Move the instance without its snapshots"
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/storage_volume.go:365
@@ -2250,7 +2259,7 @@ msgstr ""
 
 #: lxc/action.go:151
 #, fuzzy
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2259,11 +2268,11 @@ msgstr "der Name des Ursprung Containers muss angegeben werden"
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2272,30 +2281,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2324,7 +2333,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 #, fuzzy
 msgid "Network usage:"
 msgstr "Profil %s erstellt\n"
@@ -2365,13 +2374,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr "kein Wert in %q gefunden\n"
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2403,7 +2412,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2428,15 +2437,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2447,24 +2456,24 @@ msgstr "Administrator Passwort für %s: "
 
 #: lxc/action.go:49 lxc/action.go:50
 #, fuzzy
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, fuzzy, c-format
 msgid "Port type: %s"
 msgstr "Erstellt: %s"
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2494,7 +2503,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, fuzzy, c-format
 msgid "Processes: %d"
 msgstr "Profil %s erstellt\n"
@@ -2504,7 +2513,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Processing aliases failed: %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2541,12 +2550,12 @@ msgstr "Profil %s wurde auf %s angewandt\n"
 
 #: lxc/copy.go:47 lxc/init.go:49
 #, fuzzy
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/move.go:52
 #, fuzzy
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/profile.go:227
@@ -2564,7 +2573,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Profiles: "
 msgstr "Profil %s erstellt\n"
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, fuzzy, c-format
 msgid "Profiles: %s"
 msgstr "Profil %s erstellt\n"
@@ -2600,17 +2609,17 @@ msgstr "Öffentlich: %s\n"
 
 #: lxc/publish.go:34 lxc/publish.go:35
 #, fuzzy
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/publish.go:222
 #, fuzzy, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/file.go:216 lxc/file.go:217
 #, fuzzy
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2620,7 +2629,7 @@ msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
 #, fuzzy
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2632,7 +2641,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2647,7 +2656,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, fuzzy, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/image.go:1294
@@ -2685,12 +2694,12 @@ msgstr "Entferntes Administrator Passwort"
 msgid "Remote operation canceled by user"
 msgstr "Server Zertifikat vom Benutzer nicht akzeptiert"
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2711,12 +2720,12 @@ msgstr "Entferntes Administrator Passwort"
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
 #, fuzzy
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/profile.go:635 lxc/profile.go:636
 #, fuzzy
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2738,7 +2747,7 @@ msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
 #, fuzzy
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2774,7 +2783,7 @@ msgstr "Kein Zertifikat für diese Verbindung"
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2783,34 +2792,34 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
 #, fuzzy
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-#, fuzzy
-msgid "Restore containers from snapshots"
-msgstr "Herunterfahren des Containers erzwingen."
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+#, fuzzy
+msgid "Restore instances from snapshots"
+msgstr "Herunterfahren des Containers erzwingen."
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 #, fuzzy
 msgid "Restore storage volume snapshots"
@@ -2818,7 +2827,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/console.go:39
 #, fuzzy
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/init.go:285
@@ -2827,7 +2836,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2842,7 +2851,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2891,21 +2900,21 @@ msgstr ""
 
 #: lxc/config_device.go:505
 #, fuzzy
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr "Alternatives config Verzeichnis."
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2913,16 +2922,17 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Set instance or server configuration keys"
+msgstr "Alternatives config Verzeichnis."
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -3017,22 +3027,9 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-#, fuzzy
-msgid "Show container metadata files"
-msgstr "Anhalten des Containers fehlgeschlagen!"
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
 #, fuzzy
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -3044,13 +3041,29 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
-msgstr ""
+#, fuzzy
+msgid "Show full device configuration for instances or profiles"
+msgstr "Geräte zu Containern oder Profilen hinzufügen"
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#, fuzzy
+msgid "Show instance metadata files"
+msgstr "Anhalten des Containers fehlgeschlagen!"
+
+#: lxc/config.go:579 lxc/config.go:580
+#, fuzzy
+msgid "Show instance or server configurations"
+msgstr "Profil %s erstellt\n"
+
+#: lxc/info.go:32 lxc/info.go:33
+#, fuzzy
+msgid "Show instance or server information"
+msgstr "Profil %s erstellt\n"
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -3085,10 +3098,6 @@ msgstr "Profil %s erstellt\n"
 msgid "Show storage volume configurations"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr "Zeige die letzten 100 Zeilen Protokoll des Containers?"
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -3098,6 +3107,11 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+#, fuzzy
+msgid "Show the instance's last 100 log lines?"
+msgstr "Zeige die letzten 100 Zeilen Protokoll des Containers?"
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -3122,7 +3136,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr "Größe: %.2vMB\n"
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, fuzzy, c-format
 msgid "Size: %s"
 msgstr "Erstellt: %s"
@@ -3132,18 +3146,18 @@ msgstr "Erstellt: %s"
 msgid "Snapshot storage volumes"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, fuzzy, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/image.go:936
@@ -3152,7 +3166,7 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
 #, fuzzy
-msgid "Start containers"
+msgid "Start instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/launch.go:68
@@ -3165,27 +3179,28 @@ msgstr ""
 msgid "State: %s"
 msgstr "Erstellt: %s"
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
 #, fuzzy
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+#, fuzzy
+msgid "Stopping instance failed!"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/delete.go:120
 #, fuzzy, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/storage.go:145
@@ -3230,24 +3245,24 @@ msgstr "Profil %s erstellt\n"
 
 #: lxc/action.go:114
 #, fuzzy
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -3268,11 +3283,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -3284,20 +3295,6 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
-#: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
-msgstr ""
-
-#: lxc/publish.go:110
-msgid ""
-"The container is currently running. Use --force to have it stopped and "
-"restarted"
-msgstr ""
-
-#: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
 #: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
 #, fuzzy
 msgid "The device already exists"
@@ -3309,6 +3306,20 @@ msgstr "entfernte Instanz %s existiert bereits"
 msgid "The device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
+#: lxc/delete.go:104
+msgid "The instance is currently running, stop it first or pass --force"
+msgstr ""
+
+#: lxc/publish.go:110
+msgid ""
+"The instance is currently running. Use --force to have it stopped and "
+"restarted"
+msgstr ""
+
+#: lxc/init.go:388
+msgid "The instance you are starting doesn't have any network attached to it."
+msgstr ""
+
 #: lxc/init.go:372
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
@@ -3325,7 +3336,7 @@ msgid "The profile device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3346,7 +3357,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3355,13 +3366,13 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
 #, fuzzy
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr "Wartezeit bevor der Container gestoppt wird."
 
 #: lxc/image.go:897
@@ -3370,7 +3381,7 @@ msgid "Timestamps:"
 msgstr "Zeitstempel:\n"
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3382,20 +3393,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, fuzzy, c-format
 msgid "Transceiver type: %s"
 msgstr "unbekannter entfernter Instanz Name: %q"
@@ -3412,27 +3423,27 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
-#, fuzzy, c-format
-msgid "Transferring container: %s"
-msgstr "kann nicht zum selben Container Namen kopieren"
-
 #: lxc/image.go:725
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
+#: lxc/copy.go:354
+#, fuzzy, c-format
+msgid "Transferring instance: %s"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
 #: lxc/action.go:196 lxc/launch.go:99
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3450,7 +3461,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3472,16 +3483,18 @@ msgstr "Unbekannter Befehl %s für Abbild"
 
 #: lxc/move.go:53
 #, fuzzy
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr "nicht alle Profile der Quelle sind am Ziel vorhanden."
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Unset instance device configuration keys"
+msgstr "Alternatives config Verzeichnis."
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Unset instance or server configuration keys"
+msgstr "Alternatives config Verzeichnis."
 
 #: lxc/network.go:1142 lxc/network.go:1143
 msgid "Unset network configuration keys"
@@ -3505,6 +3518,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr "Alternatives config Verzeichnis."
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3515,7 +3533,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3533,22 +3551,22 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, fuzzy, c-format
 msgid "Vendor: %v"
 msgstr "Fehler: %v\n"
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, fuzzy, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
@@ -3557,7 +3575,7 @@ msgstr ""
 "Optionen:\n"
 "\n"
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3579,15 +3597,17 @@ msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "Zustand des laufenden Containers sichern oder nicht"
 
 #: lxc/restore.go:36
+#, fuzzy
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 "Laufenden Zustand des Containers aus dem Sicherungspunkt (falls vorhanden) "
 "wiederherstellen oder nicht"
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+#, fuzzy
+msgid "Whether or not to snapshot the instance's running state"
 msgstr "Zustand des laufenden Containers sichern oder nicht"
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3606,12 +3626,12 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/copy.go:82
 #, fuzzy
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
 #: lxc/copy.go:77 lxc/move.go:220
 #, fuzzy
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
 #: lxc/alias.go:52
@@ -3623,12 +3643,21 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+#, fuzzy
+msgid "add [<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/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+#, fuzzy
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/remote.go:83
 msgid "add [<remote>] <IP|FQDN|URL>"
@@ -3640,17 +3669,21 @@ msgid "alias"
 msgstr "Aliasse:\n"
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+#, fuzzy
+msgid "attach [<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:216
 msgid ""
@@ -3672,8 +3705,12 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+#, fuzzy
+msgid "console [<remote>:]<instance>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/storage_volume.go:298
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
@@ -3696,8 +3733,12 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+#, fuzzy
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/network.go:252
 msgid "create [<remote>:]<network> [key=value...]"
@@ -3731,13 +3772,25 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+#, fuzzy
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+#, fuzzy
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/file.go:102
 #, fuzzy
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -3746,7 +3799,7 @@ msgstr ""
 #: lxc/delete.go:27
 #, fuzzy
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
@@ -3754,14 +3807,6 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/image.go:267
-#, fuzzy
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3799,20 +3844,32 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+#, fuzzy
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+#, fuzzy
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/storage_volume.go:695
 msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+#, fuzzy
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/config_device.go:22
 msgid "device"
@@ -3826,21 +3883,36 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+#, fuzzy
+msgid "edit [<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_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+#, fuzzy
+msgid "edit [<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/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+#, fuzzy
+msgid "edit [<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/network.go:544
 msgid "edit [<remote>:]<network>"
@@ -3869,7 +3941,7 @@ msgstr ""
 
 #: lxc/config.go:88
 #, fuzzy
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
@@ -3890,35 +3962,38 @@ msgid "error: %v"
 msgstr "Fehler: %v\n"
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
+#: lxc/image.go:444
+msgid "export [<remote>:]<image> [<target>]"
+msgstr ""
+
 #: lxc/export.go:31
 #, fuzzy
 msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/image.go:444
-msgid "export [<remote>:]<image> [<target>]"
-msgstr ""
-
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+#, fuzzy
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/network.go:667
 msgid "get [<remote>:]<network> <key>"
@@ -3950,8 +4025,12 @@ msgstr ""
 "lxd %s <Name>\n"
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+#, fuzzy
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/remote.go:417
 msgid "get-default"
@@ -3987,9 +4066,14 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+#, fuzzy
+msgid "info [<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/init.go:38
 #, fuzzy
@@ -4021,12 +4105,20 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+#, fuzzy
+msgid "list [<remote>:]<instance>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+#, fuzzy
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/storage_volume.go:1066
 msgid "list [<remote>:]<pool>"
@@ -4056,21 +4148,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -4082,20 +4174,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -4110,13 +4202,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -4127,7 +4219,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -4135,17 +4227,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -4167,15 +4259,15 @@ msgstr ""
 #: lxc/move.go:39
 #, fuzzy
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 "Verschiebt Container innerhalb einer oder zwischen lxd Instanzen\n"
@@ -4204,7 +4296,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -4221,8 +4313,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -4282,8 +4374,7 @@ msgstr ""
 #: lxc/move.go:34
 #, fuzzy
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
@@ -4313,12 +4404,16 @@ msgid "operation"
 msgstr "Eigenschaften:\n"
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+#, fuzzy
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/action.go:48
 #, fuzzy
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4338,16 +4433,20 @@ msgid "project"
 msgstr ""
 
 #: lxc/publish.go:33
+#, fuzzy
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"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>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
@@ -4357,7 +4456,7 @@ msgstr ""
 #: lxc/file.go:405
 #, fuzzy
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
@@ -4393,12 +4492,20 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+#, fuzzy
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+#, fuzzy
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/cluster.go:243
 msgid "remove [<remote>:]<member>"
@@ -4418,7 +4525,7 @@ msgstr ""
 
 #: lxc/rename.go:19
 #, fuzzy
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
@@ -4454,15 +4561,20 @@ msgstr ""
 
 #: lxc/action.go:68
 #, fuzzy
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+#, 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"
 
 #: lxc/storage_volume.go:1561
 #, fuzzy
@@ -4475,7 +4587,7 @@ msgstr ""
 
 #: lxc/config_device.go:504
 #, fuzzy
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4519,7 +4631,7 @@ msgstr ""
 
 #: lxc/config.go:452
 #, fuzzy
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4529,21 +4641,36 @@ msgstr ""
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+#, 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"
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+#, 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/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+#, 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"
 
 #: lxc/cluster.go:144
 msgid "show [<remote>:]<member>"
@@ -4580,7 +4707,7 @@ msgstr ""
 
 #: lxc/config.go:578
 #, fuzzy
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Löscht einen Container oder Container Sicherungspunkt.\n"
 "\n"
@@ -4588,8 +4715,13 @@ msgstr ""
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+#, 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"
 
 #: lxc/storage_volume.go:1490
 #, fuzzy
@@ -4606,23 +4738,23 @@ msgstr ""
 
 #: lxc/action.go:29
 #, fuzzy
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
 #, fuzzy
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4640,7 +4772,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4662,8 +4794,12 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+#, fuzzy
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/network.go:1141
 msgid "unset [<remote>:]<network> <key>"
@@ -4690,8 +4826,12 @@ msgstr ""
 "lxd %s <Name>\n"
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+#, 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"
@@ -4714,6 +4854,10 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Missing container.name name"
+#~ msgstr "der Name des Ursprung Containers muss angegeben werden"
+
 #, fuzzy
 #~ msgid "Enable debug mode"
 #~ msgstr "Aktiviert Debug Modus"
diff --git a/po/el.po b/po/el.po
index cc8213387d..3d3250ce04 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\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/"
@@ -56,7 +56,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -71,9 +71,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -95,16 +105,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -163,7 +163,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -192,38 +192,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -252,7 +249,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -280,10 +277,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -311,22 +308,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -334,11 +331,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -346,14 +343,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -362,7 +359,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -402,19 +399,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -426,21 +423,21 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, fuzzy, c-format
 msgid "CPU (%s):"
 msgstr "  Χρήση CPU:"
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 #, fuzzy
 msgid "CPU usage:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -453,7 +450,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -463,7 +460,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -513,12 +510,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -538,7 +535,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -572,7 +569,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -580,7 +577,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -594,32 +591,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -632,6 +616,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -644,15 +632,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -675,12 +662,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -688,16 +675,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -705,29 +696,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -745,14 +736,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -766,7 +753,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -784,7 +771,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -800,16 +787,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -820,6 +799,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -861,7 +848,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -893,7 +880,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -901,7 +888,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -928,7 +915,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -953,22 +940,22 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, fuzzy, c-format
 msgid "Disk %d:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 #, fuzzy
 msgid "Disk usage:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 #, fuzzy
 msgid "Disk:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 #, fuzzy
 msgid "Disks:"
 msgstr "  Χρήση CPU:"
@@ -981,7 +968,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1000,24 +987,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1046,14 +1033,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1069,7 +1056,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1082,19 +1069,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1121,11 +1108,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1192,11 +1179,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1211,12 +1198,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1235,26 +1222,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1271,11 +1258,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1306,7 +1293,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1314,12 +1301,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1351,11 +1338,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1389,11 +1376,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1407,12 +1390,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1420,11 +1407,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1493,11 +1489,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1532,12 +1528,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1566,48 +1562,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1625,12 +1663,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1645,48 +1683,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1711,12 +1707,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1729,7 +1725,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1756,7 +1752,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1767,24 +1763,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1799,8 +1779,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1814,6 +1794,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1846,7 +1842,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1861,20 +1857,20 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 #, fuzzy
 msgid "Memory usage:"
 msgstr "  Χρήση μνήμης:"
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 #, fuzzy
 msgid "Memory:"
 msgstr "  Χρήση μνήμης:"
@@ -1894,12 +1890,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1949,12 +1942,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1980,22 +1973,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -2006,7 +1998,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2015,11 +2007,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2028,30 +2020,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2080,7 +2072,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 #, fuzzy
 msgid "Network usage:"
 msgstr "  Χρήση δικτύου:"
@@ -2118,13 +2110,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2156,7 +2148,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2181,15 +2173,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2199,24 +2191,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2256,7 +2248,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2292,11 +2284,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2312,7 +2304,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2346,16 +2338,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2364,7 +2356,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2376,7 +2368,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2391,7 +2383,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2428,12 +2420,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2452,11 +2444,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2477,7 +2469,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2509,7 +2501,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2518,38 +2510,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2558,7 +2550,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2573,7 +2565,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2619,21 +2611,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2641,16 +2633,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2742,20 +2734,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2767,13 +2747,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2806,10 +2798,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2819,6 +2807,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2843,7 +2835,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2852,18 +2844,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2871,7 +2863,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2884,26 +2876,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2944,24 +2936,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2982,11 +2974,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2998,27 +2986,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3036,7 +3024,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3055,7 +3043,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3064,12 +3052,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3077,7 +3065,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3089,20 +3077,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3119,14 +3107,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3134,12 +3122,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3157,7 +3145,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3178,15 +3166,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3209,6 +3197,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3219,7 +3212,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3237,27 +3230,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3278,12 +3271,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3300,11 +3293,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3316,11 +3309,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3332,16 +3325,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3364,7 +3357,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3388,7 +3381,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3423,24 +3416,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3470,11 +3463,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3482,7 +3475,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3497,20 +3490,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3534,7 +3527,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3551,30 +3544,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3598,7 +3590,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3635,8 +3627,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3665,11 +3657,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3700,21 +3692,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3726,20 +3718,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3754,13 +3746,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3771,7 +3763,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3779,17 +3771,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3810,15 +3802,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3844,7 +3836,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3861,8 +3853,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3921,8 +3913,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3946,11 +3937,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3967,19 +3958,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -4008,11 +3998,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4032,7 +4022,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4058,11 +4048,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4070,7 +4060,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4094,27 +4084,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4146,11 +4136,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4162,19 +4152,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4189,7 +4179,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4211,7 +4201,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4235,7 +4225,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/es.po b/po/es.po
index a89ffae9c7..306c9f1ec9 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\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/"
@@ -65,12 +65,13 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:103
+#, fuzzy
 msgid ""
 "### This is a yaml representation of the configuration.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -102,9 +103,26 @@ msgstr ""
 "###\n"
 "### Note que el nombre se muestra pero no puede ser cambiado"
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+"### Esta es una representación yaml de las propiedades de la imagen.\n"
+"### Cualquier línea que empiece con un '# será ignorada..\n"
+"###\n"
+"### Cada propiedad es representada por una única línea:\n"
+"### Un ejemplo sería:\n"
+"###  description: My custom image"
+
 #: lxc/config_metadata.go:62
+#, fuzzy
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -146,22 +164,6 @@ msgstr ""
 "###     template: template.tpl\n"
 "###     properties: {}"
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-"### Esta es una representación yaml de las propiedades de la imagen.\n"
-"### Cualquier línea que empiece con un '# será ignorada..\n"
-"###\n"
-"### Cada propiedad es representada por una única línea:\n"
-"### Un ejemplo sería:\n"
-"###  description: My custom image"
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -235,7 +237,7 @@ msgstr ""
 "###   source: /home/chb/mnt/lxd_test/default.img\n"
 "###   zfs.pool_name: default"
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -264,38 +266,36 @@ msgstr "%s no es un tipo de archivo soportado."
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr "--container-only no se puede pasar cuando la fuente es una instantánea"
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
+#: lxc/copy.go:153
+#, fuzzy
+msgid "--instance-only can't be passed when the source is a snapshot"
+msgstr "--container-only no se puede pasar cuando la fuente es una instantánea"
+
 #: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+msgid "--refresh can only be used with instances"
 msgstr ""
 
 #: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
-msgstr ""
-
-#: lxc/info.go:423
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -324,7 +324,7 @@ msgid "Action (defaults to GET)"
 msgstr "Accion (predeterminados a GET)"
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -353,10 +353,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, fuzzy, c-format
 msgid "Address: %s"
 msgstr "Expira: %s"
@@ -384,22 +384,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr "Aliases:"
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr "Arquitectura: %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, fuzzy, c-format
 msgid "Architecture: %v"
 msgstr "Arquitectura: %s"
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -407,11 +407,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -419,14 +419,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -435,7 +435,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr "Tipo de autenticación %s no está soportada por el servidor"
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -475,19 +475,20 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+#, fuzzy
+msgid "Both --all and instance name given"
 msgstr "Ambas: todas y el nombre del contenedor dado"
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, fuzzy, c-format
 msgid "Brand: %v"
 msgstr "Creado: %s"
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr "Bytes recibidos"
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr "Bytes enviados"
 
@@ -499,20 +500,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr "NOMBRE COMÚN"
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, fuzzy, c-format
 msgid "CPU (%s):"
 msgstr "Uso de CPU:"
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr "Uso de CPU (en segundos)"
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr "Uso de CPU:"
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -525,7 +526,7 @@ msgstr "CREADO"
 msgid "CREATED AT"
 msgstr "CREADO EN"
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -535,7 +536,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr "Cacheado: %s"
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 #, fuzzy
 msgid "Caches:"
 msgstr "Cacheado: %s"
@@ -587,12 +588,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, fuzzy, c-format
 msgid "Card: %s (%s)"
 msgstr "Cacheado: %s"
@@ -613,7 +614,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -647,16 +648,18 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
-msgstr ""
+#, fuzzy
+msgid "Config key/value to apply to the new instance"
+msgstr "Perfil para aplicar al nuevo contenedor"
 
 #: lxc/project.go:88
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
-msgstr ""
+#, fuzzy
+msgid "Config key/value to apply to the target instance"
+msgstr "Perfil para aplicar al nuevo contenedor"
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
@@ -669,32 +672,19 @@ msgstr ""
 msgid "Console log:"
 msgstr "Log de la consola:"
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr "Nombre del contenedor es obligatorio"
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr "Contenedor publicado con huella digital: %s"
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -707,6 +697,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -719,15 +713,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -751,12 +744,12 @@ msgstr "Copiando la imagen: %s"
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, fuzzy, c-format
 msgid "Core %d"
 msgstr "Expira: %s"
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 #, fuzzy
 msgid "Cores:"
 msgstr "Expira: %s"
@@ -765,17 +758,22 @@ msgstr "Expira: %s"
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+#, fuzzy
+msgid "Create a virtual machine"
+msgstr "Copiando la imagen: %s"
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
 #, fuzzy
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr "Creando el contenedor"
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -784,29 +782,30 @@ msgstr ""
 
 #: lxc/snapshot.go:23
 #, fuzzy
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
-msgstr ""
+#, fuzzy
+msgid "Create instances from images"
+msgstr "Creando el contenedor"
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -824,15 +823,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/init.go:57
-#, fuzzy
-msgid "Create virtual machine"
-msgstr "Copiando la imagen: %s"
-
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr "Creado: %s"
@@ -847,7 +841,7 @@ msgstr "Creando %s"
 msgid "Creating the instance"
 msgstr "Creando el contenedor"
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -865,7 +859,7 @@ msgstr "DESCRIPCIÓN"
 msgid "DRIVER"
 msgstr "CONTROLADOR"
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -881,16 +875,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -901,6 +887,15 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+#, fuzzy
+msgid "Delete instances and snapshots"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -942,7 +937,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -974,7 +969,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -982,7 +977,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -1009,7 +1004,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr "El dispostivo ya existe: %s"
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, fuzzy, c-format
 msgid "Device: %s"
 msgstr "Cacheado: %s"
@@ -1034,21 +1029,21 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, fuzzy, c-format
 msgid "Disk %d:"
 msgstr "Uso del disco:"
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr "Uso del disco:"
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 #, fuzzy
 msgid "Disk:"
 msgstr "Uso del disco:"
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 #, fuzzy
 msgid "Disks:"
 msgstr "Uso del disco:"
@@ -1061,7 +1056,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1080,24 +1075,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1126,14 +1121,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1149,7 +1144,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1162,19 +1157,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1202,12 +1197,12 @@ msgstr ""
 
 #: lxc/export.go:32
 #, fuzzy
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/export.go:33
 #, fuzzy
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/export.go:120
@@ -1275,11 +1270,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1294,12 +1289,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1318,26 +1313,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1354,11 +1349,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1389,7 +1384,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1397,12 +1392,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1434,12 +1429,13 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
-msgstr ""
+#, fuzzy
+msgid "Ignore the instance state"
+msgstr "Creando el contenedor"
 
 #: lxc/image.go:1326
 msgid "Image already up to date."
@@ -1472,14 +1468,9 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
-#: lxc/import.go:27
-#, fuzzy
-msgid "Import container backups"
-msgstr "No se puede proveer el nombre del container a la lista"
-
 #: lxc/image.go:605
 msgid ""
 "Import image into the image store\n"
@@ -1491,12 +1482,17 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+#, fuzzy
+msgid "Import instance backups"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/import.go:72
 #, fuzzy, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1504,11 +1500,21 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+#, fuzzy
+msgid "Instance name is mandatory"
+msgstr "Nombre del contenedor es obligatorio"
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Nombre del contenedor es: %s"
 
+#: lxc/publish.go:276
+#, fuzzy, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr "Contenedor publicado con huella digital: %s"
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1577,11 +1583,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, fuzzy, c-format
 msgid "IsSM: %s (%s)"
 msgstr "Cacheado: %s"
@@ -1616,12 +1622,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, fuzzy, c-format
 msgid "Link detected: %v"
 msgstr "Arquitectura: %s"
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1651,48 +1657,91 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
-msgstr ""
+#, fuzzy
+msgid "List instances"
+msgstr "Aliases:"
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1710,12 +1759,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1730,48 +1779,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1796,12 +1803,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr "Registro:"
 
@@ -1814,7 +1821,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, fuzzy, c-format
 msgid "MAD: %s (%s)"
 msgstr "Cacheado: %s"
@@ -1841,7 +1848,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1852,25 +1859,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
-msgstr ""
+#, fuzzy
+msgid "Manage files in instances"
+msgstr "Creando el contenedor"
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
 msgid "Manage image aliases"
@@ -1884,8 +1876,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1899,6 +1891,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1931,7 +1939,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1946,19 +1954,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1977,15 +1985,12 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
 #, fuzzy
-msgid "Missing container name"
+msgid "Missing instance name"
 msgstr "Nombre del contenedor es: %s"
 
-#: lxc/profile.go:125
-msgid "Missing container.name name"
-msgstr ""
-
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
 #: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
 #: lxc/config_device.go:637
@@ -2035,12 +2040,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr "%s no es un directorio"
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -2066,22 +2071,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -2092,7 +2096,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2101,11 +2105,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2114,30 +2118,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2166,7 +2170,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2203,13 +2207,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2241,7 +2245,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2266,15 +2270,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2284,24 +2288,25 @@ msgid "Password for %s: "
 msgstr "Contraseña admin para %s:"
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
-msgstr ""
+#, fuzzy
+msgid "Pause instances"
+msgstr "Creando el contenedor"
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, fuzzy, c-format
 msgid "Port type: %s"
 msgstr "Auto actualización: %s"
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2331,7 +2336,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr "Procesos: %d"
@@ -2341,7 +2346,7 @@ msgstr "Procesos: %d"
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2377,12 +2382,14 @@ msgid "Profile %s renamed to %s"
 msgstr "Perfil %s renombrado a %s"
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+#, fuzzy
+msgid "Profile to apply to the new instance"
 msgstr "Perfil para aplicar al nuevo contenedor"
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
-msgstr ""
+#, fuzzy
+msgid "Profile to apply to the target instance"
+msgstr "Perfil para aplicar al nuevo contenedor"
 
 #: lxc/profile.go:227
 #, c-format
@@ -2398,7 +2405,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr "Perfil %s creado"
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2432,16 +2439,16 @@ msgid "Public: %s"
 msgstr "Público: %s"
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, fuzzy, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2450,7 +2457,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2462,7 +2469,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2477,7 +2484,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, fuzzy, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/image.go:1294
@@ -2514,12 +2521,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2538,11 +2545,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2563,8 +2570,9 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
-msgstr ""
+#, fuzzy
+msgid "Rename instances and snapshots"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:960 lxc/network.go:961
 msgid "Rename networks"
@@ -2595,7 +2603,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2604,38 +2612,39 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+#, fuzzy
+msgid "Restore instances from snapshots"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2644,7 +2653,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2659,7 +2668,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2705,21 +2714,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2727,16 +2736,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2828,20 +2837,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2853,13 +2850,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2892,10 +2901,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2905,6 +2910,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2929,7 +2938,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, fuzzy, c-format
 msgid "Size: %s"
 msgstr "Auto actualización: %s"
@@ -2938,27 +2947,28 @@ msgstr "Auto actualización: %s"
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
-#, c-format
-msgid "Some containers failed to %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Some instances failed to %s"
+msgstr "Dispositivo %s añadido a %s"
 
 #: lxc/image.go:936
 msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
-msgstr ""
+#, fuzzy
+msgid "Start instances"
+msgstr "Creando el contenedor"
 
 #: lxc/launch.go:68
 #, c-format
@@ -2970,27 +2980,27 @@ msgstr ""
 msgid "State: %s"
 msgstr "Auto actualización: %s"
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
-#, c-format
-msgid "Stopping the container failed: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Stopping the instance failed: %s"
+msgstr "Creando el contenedor"
 
 #: lxc/storage.go:145
 #, c-format
@@ -3030,24 +3040,25 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
-msgstr ""
+#, fuzzy
+msgid "Store the instance state"
+msgstr "Creando el contenedor"
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -3068,11 +3079,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -3084,27 +3091,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3122,7 +3129,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3141,7 +3148,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3150,12 +3157,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3163,7 +3170,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3175,20 +3182,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3205,27 +3212,27 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
-#, c-format
-msgid "Transferring container: %s"
-msgstr ""
-
 #: lxc/image.go:725
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
+#: lxc/copy.go:354
+#, fuzzy, c-format
+msgid "Transferring instance: %s"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/action.go:196 lxc/launch.go:99
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Expira: %s"
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3243,7 +3250,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3264,15 +3271,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3295,6 +3302,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3305,7 +3317,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3323,27 +3335,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, fuzzy, c-format
 msgid "Verb: %s (%s)"
 msgstr "Cacheado: %s"
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3364,12 +3376,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3386,11 +3398,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3402,12 +3414,14 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
-msgstr ""
+#, fuzzy
+msgid "add [<remote>:]<instance> <profile>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
-msgstr ""
+#, fuzzy
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/remote.go:83
 msgid "add [<remote>] <IP|FQDN|URL>"
@@ -3419,16 +3433,16 @@ msgid "alias"
 msgstr "Aliases:"
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3451,7 +3465,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3475,8 +3489,9 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "create [<remote>:]<instance> <template>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:252
 msgid "create [<remote>:]<network> [key=value...]"
@@ -3510,23 +3525,25 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
-#: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
+#: lxc/config_template.go:106
+#, fuzzy
+msgid "delete [<remote>:]<instance> <template>"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
+#, fuzzy
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
-msgstr ""
-
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
@@ -3557,11 +3574,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3569,7 +3586,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3584,21 +3601,24 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
-#: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
 msgstr ""
 
+#: lxc/config_metadata.go:51
+#, fuzzy
+msgid "edit [<remote>:]<instance>"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "edit [<remote>:]<instance> <template>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
-msgstr ""
+#, fuzzy
+msgid "edit [<remote>:]<instance>/<path>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:544
 msgid "edit [<remote>:]<network>"
@@ -3622,7 +3642,7 @@ msgstr ""
 
 #: lxc/config.go:88
 #, fuzzy
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/cluster.go:329
@@ -3639,31 +3659,31 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, fuzzy, c-format
 msgid "expires at %s"
 msgstr "Expira: %s"
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
-msgstr ""
+#, fuzzy
+msgid "get [<remote>:]<instance|profile> <device> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:667
 msgid "get [<remote>:]<network> <key>"
@@ -3686,8 +3706,9 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
-msgstr ""
+#, fuzzy
+msgid "get [<remote>:][<instance>] <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/remote.go:417
 msgid "get-default"
@@ -3723,9 +3744,10 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
-msgstr ""
+#: lxc/info.go:31
+#, fuzzy
+msgid "info [<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"
@@ -3753,12 +3775,14 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
-msgstr ""
+#, fuzzy
+msgid "list [<remote>:]<instance>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
-msgstr ""
+#, fuzzy
+msgid "list [<remote>:]<instance|profile>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/storage_volume.go:1066
 msgid "list [<remote>:]<pool>"
@@ -3788,21 +3812,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3814,20 +3838,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3842,13 +3866,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3859,7 +3883,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3867,17 +3891,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3898,15 +3922,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3932,7 +3956,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3949,8 +3973,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -4008,10 +4032,10 @@ msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
 #: lxc/move.go:34
+#, fuzzy
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
-msgstr ""
+"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"
@@ -4034,12 +4058,14 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
-msgstr ""
+#, fuzzy
+msgid "override [<remote>:]<instance> <device> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
-msgstr ""
+#, fuzzy
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/config.go:54
 msgid "please use `lxc profile`"
@@ -4055,19 +4081,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -4096,12 +4121,14 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
-msgstr ""
+#, fuzzy
+msgid "remove [<remote>:]<instance> <profile>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
-msgstr ""
+#, fuzzy
+msgid "remove [<remote>:]<instance|profile> <name>..."
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/cluster.go:243
 msgid "remove [<remote>:]<member>"
@@ -4120,8 +4147,9 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
-msgstr ""
+#, fuzzy
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/cluster.go:193
 msgid "rename [<remote>:]<member> <new-name>"
@@ -4146,20 +4174,23 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
-msgstr ""
+#, fuzzy
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
-msgstr ""
+#, fuzzy
+msgid "restore [<remote>:]<instance> <snapshot>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/storage_volume.go:1561
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
-msgstr ""
+#, fuzzy
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:1009
 msgid "set [<remote>:]<network> <key>=<value>..."
@@ -4183,28 +4214,31 @@ msgstr ""
 
 #: lxc/config.go:452
 #, fuzzy
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
 msgstr ""
 
+#: lxc/config_metadata.go:173
+#, fuzzy
+msgid "show [<remote>:]<instance>"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "show [<remote>:]<instance> <template>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
-msgstr ""
+#, fuzzy
+msgid "show [<remote>:]<instance|profile>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/cluster.go:144
 msgid "show [<remote>:]<member>"
@@ -4236,12 +4270,13 @@ msgstr ""
 
 #: lxc/config.go:578
 #, fuzzy
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
-msgstr ""
+#, fuzzy
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/storage_volume.go:1490
 msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
@@ -4252,20 +4287,22 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
-msgstr ""
+#, fuzzy
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
-msgstr ""
+#, 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"
@@ -4279,7 +4316,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4301,8 +4338,9 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
-msgstr ""
+#, fuzzy
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:1141
 msgid "unset [<remote>:]<network> <key>"
@@ -4325,8 +4363,9 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
-msgstr ""
+#, fuzzy
+msgid "unset [<remote>:][<instance>] <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/storage.go:442
 msgid "used by"
diff --git a/po/fa.po b/po/fa.po
index d1d78c6194..7fe79f866c 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/fi.po b/po/fi.po
index e7e83aef45..9a92ef1ce0 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/fr.po b/po/fr.po
index 497fdb1e81..a68ccd0c8c 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\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/"
@@ -75,12 +75,13 @@ msgstr ""
 "###  description: Mon image personnalisée"
 
 #: lxc/config.go:103
+#, fuzzy
 msgid ""
 "### This is a yaml representation of the configuration.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -112,10 +113,26 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+"### Ceci est une représentation yaml des propriétés de l'image.\n"
+"### Toute ligne commençant par un '# sera ignorée.\n"
+"###\n"
+"### Chaque propriété est représentée par une ligne unique :\n"
+"### Un exemple serait :\n"
+"###  description: Mon image personnalisée"
+
 #: lxc/config_metadata.go:62
 #, fuzzy
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -154,22 +171,6 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-"### Ceci est une représentation yaml des propriétés de l'image.\n"
-"### Toute ligne commençant par un '# sera ignorée.\n"
-"###\n"
-"### Chaque propriété est représentée par une ligne unique :\n"
-"### Un exemple serait :\n"
-"###  description: Mon image personnalisée"
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -278,7 +279,7 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -307,38 +308,35 @@ msgstr "'%s' n'est pas un format de fichier pris en charge."
 msgid "(none)"
 msgstr "(aucun)"
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -369,7 +367,7 @@ msgid "Action (defaults to GET)"
 msgstr "Action (GET par défaut)"
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -399,10 +397,10 @@ msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
 #, fuzzy
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr "Création du conteneur"
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, fuzzy, c-format
 msgid "Address: %s"
 msgstr "Expire : %s"
@@ -430,35 +428,38 @@ msgstr ""
 msgid "Aliases:"
 msgstr "Alias :"
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architecture : %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, fuzzy, c-format
 msgid "Architecture: %v"
 msgstr "Architecture : %s"
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
-msgstr ""
+#, fuzzy
+msgid "Assign sets of profiles to instances"
+msgstr "Création du conteneur"
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
-msgstr ""
+#, fuzzy
+msgid "Attach network interfaces to instances"
+msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
 #: lxc/network.go:180 lxc/network.go:181
 msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
-msgstr ""
+#, fuzzy
+msgid "Attach new storage volumes to instances"
+msgstr "Afficher la configuration étendue"
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
 msgid "Attach new storage volumes to profiles"
@@ -466,14 +467,14 @@ msgstr ""
 
 #: lxc/console.go:31
 #, fuzzy
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -482,7 +483,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr "Le type d'authentification '%s' n'est pas supporté par le serveur"
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -523,19 +524,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, fuzzy, c-format
 msgid "Brand: %v"
 msgstr "Créé : %s"
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr "Octets reçus"
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr "Octets émis"
 
@@ -547,20 +548,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr "COMMON NAME"
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, fuzzy, c-format
 msgid "CPU (%s):"
 msgstr "CPU utilisé :"
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr "CPU utilisé (en secondes)"
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr "CPU utilisé :"
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -574,7 +575,7 @@ msgstr "CRÉÉ À"
 msgid "CREATED AT"
 msgstr "CRÉÉ À"
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, fuzzy, c-format
 msgid "CUDA Version: %v"
 msgstr "Afficher la version du client"
@@ -584,7 +585,7 @@ msgstr "Afficher la version du client"
 msgid "Cached: %s"
 msgstr "Créé : %s"
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 #, fuzzy
 msgid "Caches:"
 msgstr "Créé : %s"
@@ -639,12 +640,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, fuzzy, c-format
 msgid "Card: %s (%s)"
 msgstr "Créé : %s"
@@ -665,7 +666,7 @@ msgid "Client version: %s\n"
 msgstr "Afficher la version du client"
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -705,7 +706,8 @@ msgstr ""
 "Pour de l'aide avec l'une des commandes, simplement les utiliser avec --help."
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+#, fuzzy
+msgid "Config key/value to apply to the new instance"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
 #: lxc/project.go:88
@@ -715,7 +717,7 @@ msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
 #: lxc/move.go:50
 #, fuzzy
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -729,33 +731,19 @@ msgstr "Erreur lors de la lecture de la configuration : %s"
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr "Le nom du conteneur est obligatoire"
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr "Conteneur publié avec l'empreinte : %s"
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "Copier les alias depuis la source"
 
-#: lxc/copy.go:40 lxc/copy.go:41
-#, fuzzy
-msgid "Copy containers within or in between LXD instances"
-msgstr "Copiez le conteneur sans ses instantanés"
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -768,6 +756,11 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+#, fuzzy
+msgid "Copy instances within or in between LXD servers"
+msgstr "Copiez le conteneur sans ses instantanés"
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -781,15 +774,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr "Copie de l'image : %s"
 
-#: lxc/copy.go:51
+#: lxc/copy.go:50
 #, fuzzy
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
+msgid "Copy the instance without its snapshots"
 msgstr "Copiez le conteneur sans ses instantanés"
 
-#: lxc/copy.go:50
+#: lxc/copy.go:51
 #, fuzzy
-msgid "Copy the instance without its snapshots"
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
 msgstr "Copiez le conteneur sans ses instantanés"
 
 #: lxc/storage_volume.go:306
@@ -816,12 +808,12 @@ msgstr "Copie de l'image : %s"
 msgid "Copying the storage volume: %s"
 msgstr "Copie de l'image : %s"
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, fuzzy, c-format
 msgid "Core %d"
 msgstr "erreur : %v"
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 #, fuzzy
 msgid "Cores:"
 msgstr "erreur : %v"
@@ -830,18 +822,24 @@ msgstr "erreur : %v"
 msgid "Could not create server cert dir"
 msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 
+#: lxc/init.go:57
+#, fuzzy
+msgid "Create a virtual machine"
+msgstr "Copie de l'image : %s"
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
 #, fuzzy
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr "Création du conteneur"
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
-msgstr ""
+#, fuzzy
+msgid "Create and start instances from images"
+msgstr "Création du conteneur"
 
 #: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
@@ -849,15 +847,15 @@ msgstr "Créer tous répertoires nécessaires"
 
 #: lxc/snapshot.go:23
 #, fuzzy
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr "Copiez le conteneur sans ses instantanés"
 
 #: lxc/snapshot.go:24
 #, fuzzy
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 "Créer un instantané en lecture seule d'un conteneur.\n"
@@ -878,19 +876,19 @@ msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
 #, fuzzy
-msgid "Create containers from images"
+msgid "Create instances from images"
 msgstr "Création du conteneur"
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
-#, fuzzy
-msgid "Create new container file templates"
-msgstr "L'arrêt du conteneur a échoué !"
-
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 #, fuzzy
 msgid "Create new custom storage volumes"
 msgstr "Copie de l'image : %s"
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+#, fuzzy
+msgid "Create new instance file templates"
+msgstr "L'arrêt du conteneur a échoué !"
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -912,15 +910,10 @@ msgstr "Copie de l'image : %s"
 
 #: lxc/copy.go:56 lxc/init.go:55
 #, fuzzy
-msgid "Create the container with no profiles applied"
+msgid "Create the instance with no profiles applied"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/init.go:57
-#, fuzzy
-msgid "Create virtual machine"
-msgstr "Copie de l'image : %s"
-
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr "Créé : %s"
@@ -935,7 +928,7 @@ msgstr "Création de %s"
 msgid "Creating the instance"
 msgstr "Création du conteneur"
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -953,7 +946,7 @@ msgstr "DESCRIPTION"
 msgid "DRIVER"
 msgstr "PILOTE"
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -970,19 +963,10 @@ msgstr "Définir un algorithme de compression : pour image ou aucun"
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-#, fuzzy
-msgid "Delete container file templates"
-msgstr "L'arrêt du conteneur a échoué !"
-
-#: lxc/delete.go:29 lxc/delete.go:30
-#, fuzzy
-msgid "Delete containers and snapshots"
-msgstr "Forcer le conteneur à s'arrêter"
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
-msgstr ""
+#, fuzzy
+msgid "Delete files in instances"
+msgstr "Création du conteneur"
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
 msgid "Delete image aliases"
@@ -993,6 +977,16 @@ msgstr ""
 msgid "Delete images"
 msgstr "Récupération de l'image : %s"
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+#, fuzzy
+msgid "Delete instance file templates"
+msgstr "L'arrêt du conteneur a échoué !"
+
+#: lxc/delete.go:29 lxc/delete.go:30
+#, fuzzy
+msgid "Delete instances and snapshots"
+msgstr "Forcer le conteneur à s'arrêter"
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -1036,7 +1030,7 @@ msgstr "Copie de l'image : %s"
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -1068,7 +1062,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -1076,8 +1070,9 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
-msgstr ""
+#, fuzzy
+msgid "Detach storage volumes from instances"
+msgstr "Clé de configuration invalide"
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
 msgid "Detach storage volumes from profiles"
@@ -1103,7 +1098,7 @@ msgstr "Périphérique %s retiré de %s"
 msgid "Device already exists: %s"
 msgstr "le serveur distant %s existe déjà"
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, fuzzy, c-format
 msgid "Device: %s"
 msgstr "Serveur distant : %s"
@@ -1129,22 +1124,22 @@ msgstr "Désactiver l'allocation pseudo-terminal"
 msgid "Disable stdin (reads from /dev/null)"
 msgstr "Désactiver stdin (lecture à partir de /dev/null)"
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, fuzzy, c-format
 msgid "Disk %d:"
 msgstr "  Disque utilisé :"
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 #, fuzzy
 msgid "Disk usage:"
 msgstr "  Disque utilisé :"
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 #, fuzzy
 msgid "Disk:"
 msgstr "  Disque utilisé :"
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 #, fuzzy
 msgid "Disks:"
 msgstr "  Disque utilisé :"
@@ -1158,7 +1153,7 @@ msgstr "Requérir une confirmation de l'utilisateur"
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1177,27 +1172,29 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/file.go:153 lxc/file.go:154
+#, fuzzy
+msgid "Edit files in instances"
+msgstr "Création du conteneur"
+
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 #, fuzzy
-msgid "Edit container file templates"
+msgid "Edit instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
-msgstr ""
+#, fuzzy
+msgid "Edit instance metadata files"
+msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
-msgstr ""
-
-#: lxc/file.go:153 lxc/file.go:154
 #, fuzzy
-msgid "Edit files in containers"
-msgstr "Création du conteneur"
-
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
-msgstr ""
+msgid "Edit instance or server configurations as YAML"
+msgstr "Clé de configuration invalide"
 
 #: lxc/network.go:545 lxc/network.go:546
 msgid "Edit network configurations as YAML"
@@ -1226,14 +1223,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1249,7 +1246,8 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "Variable d'environnement (de la forme HOME=/home/foo) à positionner"
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+#, fuzzy
+msgid "Ephemeral instance"
 msgstr "Conteneur éphémère"
 
 #: lxc/config_template.go:203
@@ -1262,20 +1260,20 @@ msgid "Event type to listen for"
 msgstr "Type d'évènements à surveiller"
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 #, fuzzy
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1312,12 +1310,12 @@ msgstr ""
 
 #: lxc/export.go:32
 #, fuzzy
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
 #: lxc/export.go:33
 #, fuzzy
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
 #: lxc/export.go:120
@@ -1388,12 +1386,13 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+#, fuzzy
+msgid "Force the instance to shutdown"
 msgstr "Forcer le conteneur à s'arrêter"
 
 #: lxc/delete.go:34
 #, fuzzy
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr "Forcer la suppression des conteneurs arrêtés"
 
 #: lxc/main.go:62
@@ -1408,12 +1407,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1432,26 +1431,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1469,12 +1468,13 @@ msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
 #, fuzzy
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr "Clé de configuration invalide"
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Get values for instance or server configuration keys"
+msgstr "Clé de configuration invalide"
 
 #: lxc/network.go:668 lxc/network.go:669
 #, fuzzy
@@ -1508,7 +1508,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr "NOM"
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1517,12 +1517,12 @@ msgstr ""
 msgid "ID"
 msgstr "PID"
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, fuzzy, c-format
 msgid "ID: %d"
 msgstr "Pid : %d"
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1557,12 +1557,12 @@ msgstr ""
 "sudo lxd init"
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
 #, fuzzy
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
 #: lxc/image.go:1326
@@ -1598,14 +1598,9 @@ msgid "Image refreshed successfully!"
 msgstr "Image copiée avec succès !"
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
-#: lxc/import.go:27
-#, fuzzy
-msgid "Import container backups"
-msgstr "Ignorer l'état du conteneur (seulement pour start)"
-
 #: lxc/image.go:605
 msgid ""
 "Import image into the image store\n"
@@ -1618,12 +1613,17 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr "Import de l'image : %s"
 
+#: lxc/import.go:27
+#, fuzzy
+msgid "Import instance backups"
+msgstr "Ignorer l'état du conteneur (seulement pour start)"
+
 #: lxc/import.go:72
 #, fuzzy, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1631,11 +1631,21 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+#, fuzzy
+msgid "Instance name is mandatory"
+msgstr "Le nom du conteneur est obligatoire"
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Le nom du conteneur est : %s"
 
+#: lxc/publish.go:276
+#, fuzzy, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr "Conteneur publié avec l'empreinte : %s"
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1705,11 +1715,11 @@ msgstr "Source invalide %s"
 msgid "Invalid target %s"
 msgstr "Cible invalide %s"
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr "IPs :"
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, fuzzy, c-format
 msgid "IsSM: %s (%s)"
 msgstr "Créé : %s"
@@ -1744,12 +1754,12 @@ msgstr "Dernière utilisation : %s"
 msgid "Last used: never"
 msgstr "Dernière utilisation : jamais"
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, fuzzy, c-format
 msgid "Link detected: %v"
 msgstr "Architecture : %s"
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1779,52 +1789,94 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
 #, fuzzy
-msgid "List container devices"
+msgid "List instance devices"
 msgstr "Création du conteneur"
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
 #, fuzzy
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/list.go:43
 #, fuzzy
-msgid "List containers"
+msgid "List instances"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/list.go:44
 #, fuzzy
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1842,12 +1894,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1921,48 +1973,6 @@ msgstr ""
 "    lxc list -c n,volatile.base_image:\\BASE IMAGE\\:0,s46,volatile.eth0."
 "hwaddr:MAC"
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1988,12 +1998,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr "Journal : "
 
@@ -2006,7 +2016,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, fuzzy, c-format
 msgid "MAD: %s (%s)"
 msgstr "Créé : %s"
@@ -2033,7 +2043,7 @@ msgid "Make the image public"
 msgstr "Rendre l'image publique"
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -2044,27 +2054,9 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-#, fuzzy
-msgid "Manage container devices"
-msgstr "Création du conteneur"
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-#, fuzzy
-msgid "Manage container file templates"
-msgstr "L'arrêt du conteneur a échoué !"
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr "Transfert de l'image : %s"
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -2081,8 +2073,8 @@ msgstr "Rendre l'image publique"
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -2096,6 +2088,26 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+#, fuzzy
+msgid "Manage instance and server configuration options"
+msgstr "Clé de configuration invalide"
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage instance devices"
+msgstr "Création du conteneur"
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+#, fuzzy
+msgid "Manage instance file templates"
+msgstr "L'arrêt du conteneur a échoué !"
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#, fuzzy
+msgid "Manage instance metadata files"
+msgstr "L'arrêt du conteneur a échoué !"
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -2131,7 +2143,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -2146,20 +2158,20 @@ msgstr "Profil %s supprimé de %s"
 msgid "Member %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr "Mémoire (courante)"
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr "Mémoire (pointe)"
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 #, fuzzy
 msgid "Memory usage:"
 msgstr "  Mémoire utilisée :"
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 #, fuzzy
 msgid "Memory:"
 msgstr "  Mémoire utilisée :"
@@ -2180,14 +2192,10 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-#, fuzzy
-msgid "Missing container name"
-msgstr "Vous devez fournir le nom d'un conteneur pour : "
-
-#: lxc/profile.go:125
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
 #, fuzzy
-msgid "Missing container.name name"
+msgid "Missing instance name"
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -2243,12 +2251,12 @@ msgstr "Copie de l'image : %s"
 msgid "Missing target directory"
 msgstr "%s n'est pas un répertoire"
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, fuzzy, c-format
 msgid "Model: %s"
 msgstr "Publié : %s"
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -2277,7 +2285,7 @@ msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
 #, fuzzy
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr "Forcer le conteneur à s'arrêter"
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
@@ -2285,15 +2293,14 @@ msgstr "Forcer le conteneur à s'arrêter"
 msgid "Move storage volumes between pools"
 msgstr "Copie de l'image : %s"
 
-#: lxc/move.go:54
+#: lxc/move.go:55
 #, fuzzy
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
 
-#: lxc/move.go:55
+#: lxc/move.go:54
 #, fuzzy
-msgid "Move the instance without its snapshots"
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
 msgstr "Forcer le conteneur à s'arrêter"
 
 #: lxc/storage_volume.go:365
@@ -2306,7 +2313,8 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+#, fuzzy
+msgid "Must supply instance name for: "
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2315,11 +2323,11 @@ msgstr "Vous devez fournir le nom d'un conteneur pour : "
 msgid "NAME"
 msgstr "NOM"
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2328,30 +2336,30 @@ msgstr ""
 msgid "NO"
 msgstr "NON"
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, fuzzy, c-format
 msgid "Name: %v"
 msgstr "Nom : %s"
@@ -2380,7 +2388,7 @@ msgstr "Le réseau %s a été créé"
 msgid "Network name"
 msgstr "Nom du réseau"
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 #, fuzzy
 msgid "Network usage:"
 msgstr "  Réseau utilisé :"
@@ -2421,14 +2429,14 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
 #, fuzzy
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 "Seuls les volumes \"personnalisés\" peuvent être attachés aux conteneurs."
 
@@ -2466,7 +2474,7 @@ msgstr "impossible de supprimer le serveur distant par défaut"
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr "Surcharger le mode terminal (auto, interactif ou non-interactif)"
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2491,15 +2499,15 @@ msgstr "PROTOCOLE"
 msgid "PUBLIC"
 msgstr "PUBLIC"
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr "Paquets reçus"
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr "Paquets émis"
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 #, fuzzy
 msgid "Partitions:"
 msgstr "Options :"
@@ -2511,24 +2519,24 @@ msgstr "Mot de passe administrateur pour %s : "
 
 #: lxc/action.go:49 lxc/action.go:50
 #, fuzzy
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr "Création du conteneur"
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr "Pid : %d"
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, fuzzy, c-format
 msgid "Port type: %s"
 msgstr "État : %s"
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2558,7 +2566,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr "Processus : %d"
@@ -2568,7 +2576,7 @@ msgstr "Processus : %d"
 msgid "Processing aliases failed: %s"
 msgstr "l'analyse des alias a échoué %s\n"
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2604,12 +2612,13 @@ msgid "Profile %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+#, fuzzy
+msgid "Profile to apply to the new instance"
 msgstr "Profil à appliquer au nouveau conteneur"
 
 #: lxc/move.go:52
 #, fuzzy
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr "Profil à appliquer au nouveau conteneur"
 
 #: lxc/profile.go:227
@@ -2627,7 +2636,7 @@ msgstr "Profils : %s"
 msgid "Profiles: "
 msgstr "Profils : %s"
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr "Profils : %s"
@@ -2662,17 +2671,17 @@ msgstr "Public : %s"
 
 #: lxc/publish.go:34 lxc/publish.go:35
 #, fuzzy
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr "Création du conteneur"
 
 #: lxc/publish.go:222
 #, fuzzy, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
 #: lxc/file.go:216 lxc/file.go:217
 #, fuzzy
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr "Création du conteneur"
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2682,7 +2691,7 @@ msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
 #, fuzzy
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr "Création du conteneur"
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2694,7 +2703,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2711,7 +2720,7 @@ msgstr "Récupération de l'image : %s"
 
 #: lxc/copy.go:388
 #, fuzzy, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
 #: lxc/image.go:1294
@@ -2749,12 +2758,12 @@ msgstr "Mot de passe de l'administrateur distant"
 msgid "Remote operation canceled by user"
 msgstr "Certificat serveur rejeté par l'utilisateur"
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr "Serveur distant : %s"
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, fuzzy, c-format
 msgid "Removable: %v"
 msgstr "Serveur distant : %s"
@@ -2775,12 +2784,12 @@ msgstr "Mot de passe de l'administrateur distant"
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
 #, fuzzy
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/profile.go:635 lxc/profile.go:636
 #, fuzzy
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr "Création du conteneur"
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2802,7 +2811,7 @@ msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
 #, fuzzy
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2837,7 +2846,7 @@ msgstr "Copie de l'image : %s"
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2846,35 +2855,35 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr "Requérir une confirmation de l'utilisateur"
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr "Ressources :"
 
 #: lxc/action.go:69
 #, fuzzy
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr "Création du conteneur"
 
 #: lxc/action.go:70
 #, fuzzy
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr "Le pendant de `lxc pause` est `lxc start`."
 
-#: lxc/restore.go:23
-#, fuzzy
-msgid "Restore containers from snapshots"
-msgstr "Forcer le conteneur à s'arrêter"
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+#, fuzzy
+msgid "Restore instances from snapshots"
+msgstr "Forcer le conteneur à s'arrêter"
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 #, fuzzy
 msgid "Restore storage volume snapshots"
@@ -2882,7 +2891,7 @@ msgstr "Forcer le conteneur à s'arrêter"
 
 #: lxc/console.go:39
 #, fuzzy
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
 #: lxc/init.go:285
@@ -2891,7 +2900,7 @@ msgid "Retrieving image: %s"
 msgstr "Récupération de l'image : %s"
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2906,7 +2915,7 @@ msgstr "INSTANTANÉS"
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2956,21 +2965,21 @@ msgstr ""
 
 #: lxc/config_device.go:505
 #, fuzzy
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr "Clé de configuration invalide"
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2979,16 +2988,16 @@ msgstr ""
 
 #: lxc/config.go:453
 #, fuzzy
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr "Clé de configuration invalide"
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -3085,24 +3094,9 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-#, fuzzy
-msgid "Show container metadata files"
-msgstr "L'arrêt du conteneur a échoué !"
-
-#: lxc/config.go:579 lxc/config.go:580
-#, fuzzy
-msgid "Show container or server configurations"
-msgstr "Afficher la configuration étendue"
-
-#: lxc/info.go:31 lxc/info.go:32
-#, fuzzy
-msgid "Show container or server information"
-msgstr "Afficher des informations supplémentaires"
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
 #, fuzzy
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -3114,13 +3108,28 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#, fuzzy
+msgid "Show instance metadata files"
+msgstr "L'arrêt du conteneur a échoué !"
+
+#: lxc/config.go:579 lxc/config.go:580
+#, fuzzy
+msgid "Show instance or server configurations"
+msgstr "Afficher la configuration étendue"
+
+#: lxc/info.go:32 lxc/info.go:33
+#, fuzzy
+msgid "Show instance or server information"
+msgstr "Afficher des informations supplémentaires"
+
 #: lxc/main.go:223 lxc/main.go:224
 #, fuzzy
 msgid "Show less common commands"
@@ -3160,10 +3169,6 @@ msgstr "Afficher la configuration étendue"
 msgid "Show storage volume configurations"
 msgstr "Afficher la configuration étendue"
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr "Afficher les 100 dernières lignes du journal du conteneur ?"
-
 #: lxc/remote.go:418 lxc/remote.go:419
 #, fuzzy
 msgid "Show the default remote"
@@ -3174,6 +3179,11 @@ msgid "Show the expanded configuration"
 msgstr "Afficher la configuration étendue"
 
 #: lxc/info.go:43
+#, fuzzy
+msgid "Show the instance's last 100 log lines?"
+msgstr "Afficher les 100 dernières lignes du journal du conteneur ?"
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -3198,7 +3208,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr "Taille : %.2f Mo"
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, fuzzy, c-format
 msgid "Size: %s"
 msgstr "État : %s"
@@ -3208,18 +3218,18 @@ msgstr "État : %s"
 msgid "Snapshot storage volumes"
 msgstr "Copie de l'image : %s"
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr "Instantanés :"
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, fuzzy, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/image.go:936
@@ -3228,7 +3238,7 @@ msgstr "Source :"
 
 #: lxc/action.go:30 lxc/action.go:31
 #, fuzzy
-msgid "Start containers"
+msgid "Start instances"
 msgstr "Création du conteneur"
 
 #: lxc/launch.go:68
@@ -3241,27 +3251,29 @@ msgstr "Démarrage de %s"
 msgid "State: %s"
 msgstr "État : %s"
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr "État : %s"
 
 #: lxc/action.go:90 lxc/action.go:91
 #, fuzzy
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+#, fuzzy
+msgid "Stop the instance if currently running"
 msgstr "Arrêter le conteneur s'il est en cours d'exécution"
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+#, fuzzy
+msgid "Stopping instance failed!"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/delete.go:120
 #, fuzzy, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/storage.go:145
@@ -3305,24 +3317,24 @@ msgstr "Image copiée avec succès !"
 
 #: lxc/action.go:114
 #, fuzzy
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr "Swap (courant)"
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr "Swap (pointe)"
 
@@ -3345,11 +3357,7 @@ msgstr ""
 msgid "TYPE"
 msgstr "TYPE"
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -3361,36 +3369,37 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#, fuzzy
+msgid "The device already exists"
+msgstr "Le périphérique n'existe pas"
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr "Le périphérique n'existe pas"
+
 #: lxc/delete.go:104
 #, fuzzy
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 "Le conteneur est en cours d'exécution, l'arrêter d'abord ou ajouter --force."
 
 #: lxc/publish.go:110
 #, fuzzy
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 "Le conteneur est en cours d'exécution. Utiliser --force pour qu'il soit "
 "arrêté et redémarré."
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
+#, fuzzy
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 "Le conteneur que vous démarrez n'est attaché à aucune interface réseau."
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-#, fuzzy
-msgid "The device already exists"
-msgstr "Le périphérique n'existe pas"
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
-msgstr "Le périphérique n'existe pas"
-
 #: lxc/init.go:372
 #, fuzzy, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
@@ -3407,7 +3416,7 @@ msgid "The profile device doesn't exist"
 msgstr "Le périphérique indiqué n'existe pas"
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3426,7 +3435,7 @@ msgstr "Il n'existe pas d'\"image\".  Vouliez-vous un alias ?"
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3435,12 +3444,13 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+#, fuzzy
+msgid "Time to wait for the instance before killing it"
 msgstr "Temps d'attente du conteneur avant de le tuer"
 
 #: lxc/image.go:897
@@ -3448,7 +3458,8 @@ msgid "Timestamps:"
 msgstr "Horodatage :"
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+#, fuzzy
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr "Pour attacher un réseau à un conteneur, utiliser : lxc network attach"
 
 #: lxc/init.go:389
@@ -3461,21 +3472,21 @@ msgstr ""
 
 #: lxc/main.go:345
 #, fuzzy
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 "Pour démarrer votre premier conteneur, essayer : lxc launch ubuntu:16.04"
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, fuzzy, c-format
 msgid "Transceiver type: %s"
 msgstr "Transfert de l'image : %s"
@@ -3492,27 +3503,27 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
-#, fuzzy, c-format
-msgid "Transferring container: %s"
-msgstr "Transfert de l'image : %s"
-
 #: lxc/image.go:725
 #, c-format
 msgid "Transferring image: %s"
 msgstr "Transfert de l'image : %s"
 
+#: lxc/copy.go:354
+#, fuzzy, c-format
+msgid "Transferring instance: %s"
+msgstr "Transfert de l'image : %s"
+
 #: lxc/action.go:196 lxc/launch.go:99
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr "Essayer `lxc info --show-log %s` pour plus d'informations"
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Expire : %s"
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, fuzzy, c-format
 msgid "Type: %s (ephemeral)"
 msgstr "Type : éphémère"
@@ -3530,7 +3541,7 @@ msgstr "URL"
 msgid "USED BY"
 msgstr "UTILISÉ PAR"
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3552,17 +3563,17 @@ msgstr ""
 
 #: lxc/move.go:53
 #, fuzzy
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr "tous les profils de la source n'existent pas sur la cible"
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
 #, fuzzy
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr "Clé de configuration invalide"
 
 #: lxc/config.go:698 lxc/config.go:699
 #, fuzzy
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr "Clé de configuration invalide"
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3590,6 +3601,11 @@ msgstr "Clé de configuration invalide"
 msgid "Unset storage volume configuration keys"
 msgstr "Clé de configuration invalide"
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3600,7 +3616,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, fuzzy, c-format
 msgid "Used: %v"
 msgstr "Publié : %s"
@@ -3619,27 +3635,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, fuzzy, c-format
 msgid "Vendor: %v"
 msgstr "erreur : %v"
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, fuzzy, c-format
 msgid "Verb: %s (%s)"
 msgstr "Créé : %s"
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, fuzzy, c-format
 msgid "WWN: %s"
 msgstr "Nom : %s"
@@ -3661,15 +3677,17 @@ msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
 
 #: lxc/restore.go:36
+#, fuzzy
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 "Restaurer ou pas l'état de fonctionnement du conteneur depuis l'instantané "
 "(s'il est disponible)"
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+#, fuzzy
+msgid "Whether or not to snapshot the instance's running state"
 msgstr "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3688,12 +3706,12 @@ msgstr "impossible de copier vers le même nom de conteneur"
 
 #: lxc/copy.go:82
 #, fuzzy
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr "vous devez spécifier un nom de conteneur source"
 
 #: lxc/copy.go:77 lxc/move.go:220
 #, fuzzy
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr "vous devez spécifier un nom de conteneur source"
 
 #: lxc/alias.go:52
@@ -3705,12 +3723,24 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+#, fuzzy
+msgid "add [<remote>:]<instance> <profile>"
 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:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+#, fuzzy
+msgid "add [<remote>:]<instance|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/remote.go:83
 msgid "add [<remote>] <IP|FQDN|URL>"
@@ -3722,17 +3752,22 @@ msgid "alias"
 msgstr "Alias :"
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
-msgstr ""
+#, fuzzy
+msgid "assign [<remote>:]<instance> <profiles>"
+msgstr "impossible de supprimer le serveur distant par défaut"
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+#, fuzzy
+msgid "attach [<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/storage_volume.go:216
 msgid ""
@@ -3754,8 +3789,12 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+#, fuzzy
+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:298
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
@@ -3778,8 +3817,12 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+#, fuzzy
+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/network.go:252
 msgid "create [<remote>:]<network> [key=value...]"
@@ -3814,13 +3857,25 @@ msgstr "par défaut"
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+#, fuzzy
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+#, fuzzy
+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/file.go:102
 #, fuzzy
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -3829,7 +3884,7 @@ msgstr ""
 #: lxc/delete.go:27
 #, fuzzy
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
@@ -3840,14 +3895,6 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/image.go:267
-#, fuzzy
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3885,20 +3932,32 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+#, fuzzy
+msgid "detach [<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/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+#, fuzzy
+msgid "detach [<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/storage_volume.go:695
 msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+#, fuzzy
+msgid "detach-profile [<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_device.go:22
 msgid "device"
@@ -3912,21 +3971,45 @@ msgstr "désactivé"
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+#, fuzzy
+msgid "edit [<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_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+#, fuzzy
+msgid "edit [<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/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+#, fuzzy
+msgid "edit [<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/network.go:544
 msgid "edit [<remote>:]<network>"
@@ -3958,7 +4041,7 @@ msgstr ""
 
 #: lxc/config.go:88
 #, fuzzy
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -3982,35 +4065,38 @@ msgid "error: %v"
 msgstr "erreur : %v"
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, fuzzy, c-format
 msgid "expires at %s"
 msgstr "Expire : %s"
 
+#: lxc/image.go:444
+msgid "export [<remote>:]<image> [<target>]"
+msgstr ""
+
 #: lxc/export.go:31
 #, fuzzy
 msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
+"export [<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:444
-msgid "export [<remote>:]<image> [<target>]"
-msgstr ""
-
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+#, fuzzy
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/network.go:667
 msgid "get [<remote>:]<network> <key>"
@@ -4045,8 +4131,12 @@ msgstr ""
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+#, fuzzy
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/remote.go:417
 #, fuzzy
@@ -4083,9 +4173,17 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+#, fuzzy
+msgid "info [<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/init.go:38
 #, fuzzy
@@ -4117,12 +4215,20 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+#, fuzzy
+msgid "list [<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:258
-msgid "list [<remote>:]<container|profile>"
+#, fuzzy
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage_volume.go:1066
 msgid "list [<remote>:]<pool>"
@@ -4152,21 +4258,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -4178,20 +4284,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -4206,14 +4312,14 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 #, fuzzy
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -4233,7 +4339,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -4241,17 +4347,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -4273,15 +4379,15 @@ msgstr ""
 #: lxc/move.go:39
 #, fuzzy
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 "Déplacer les conteneurs dans ou entre des instances lxd.\n"
@@ -4318,7 +4424,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -4335,8 +4441,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -4396,8 +4502,7 @@ msgstr ""
 #: lxc/move.go:34
 #, fuzzy
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4430,12 +4535,16 @@ msgid "operation"
 msgstr "Propriétés :"
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+#, fuzzy
+msgid "override [<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/action.go:48
 #, fuzzy
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -4457,8 +4566,7 @@ msgstr ""
 #: lxc/publish.go:33
 #, fuzzy
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 "Publier des conteneurs en tant qu'images.\n"
 "\n"
@@ -4468,8 +4576,8 @@ msgstr ""
 #: lxc/file.go:215
 #, fuzzy
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4482,7 +4590,7 @@ msgstr ""
 #: lxc/file.go:405
 #, fuzzy
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
@@ -4519,12 +4627,20 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+#, 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/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+#, fuzzy
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/cluster.go:243
 msgid "remove [<remote>:]<member>"
@@ -4544,7 +4660,7 @@ msgstr ""
 
 #: lxc/rename.go:19
 #, fuzzy
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4586,15 +4702,23 @@ msgstr ""
 
 #: lxc/action.go:68
 #, fuzzy
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+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
-msgid "restore [<remote>:]<container> <snapshot>"
+#, 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, …)."
 
 #: lxc/storage_volume.go:1561
 #, fuzzy
@@ -4610,7 +4734,7 @@ msgstr ""
 
 #: lxc/config_device.go:504
 #, fuzzy
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -4654,7 +4778,7 @@ msgstr ""
 
 #: lxc/config.go:452
 #, fuzzy
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -4664,21 +4788,45 @@ msgstr ""
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+#, 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, …)."
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+#, 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/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+#, fuzzy
+msgid "show [<remote>:]<instance|profile>"
 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:144
 msgid "show [<remote>:]<member>"
@@ -4718,7 +4866,7 @@ msgstr ""
 
 #: lxc/config.go:578
 #, fuzzy
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Supprimer des conteneurs ou des instantanés.\n"
 "\n"
@@ -4729,8 +4877,16 @@ msgstr ""
 "(configuration, instantanés, …)."
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+#, 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, …)."
 
 #: lxc/storage_volume.go:1490
 #, fuzzy
@@ -4750,23 +4906,23 @@ msgstr ""
 
 #: lxc/action.go:29
 #, fuzzy
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+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
+#: lxc/info.go:583
 msgid "stateful"
 msgstr "à suivi d'état"
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr "sans suivi d'état"
 
 #: lxc/action.go:89
 #, fuzzy
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -4786,7 +4942,7 @@ msgstr "impossible de supprimer le serveur distant par défaut"
 msgid "switch [<remote>:] <project>"
 msgstr "impossible de supprimer le serveur distant par défaut"
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr "pris à %s"
@@ -4808,8 +4964,12 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+#, fuzzy
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/network.go:1141
 msgid "unset [<remote>:]<network> <key>"
@@ -4836,8 +4996,12 @@ msgstr ""
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+#, 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"
@@ -4861,6 +5025,10 @@ msgstr ""
 msgid "yes"
 msgstr "oui"
 
+#, fuzzy
+#~ msgid "Missing container.name name"
+#~ msgstr "Vous devez fournir le nom d'un conteneur pour : "
+
 #~ msgid "ARCH"
 #~ msgstr "ARCH"
 
diff --git a/po/hi.po b/po/hi.po
index e3b6bb9162..dfdbee7481 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/id.po b/po/id.po
index f5f47bf08d..e4af64cb0b 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/it.po b/po/it.po
index bab7a1040e..fc9bd166ea 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\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/"
@@ -66,12 +66,13 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:103
+#, fuzzy
 msgid ""
 "### This is a yaml representation of the configuration.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -85,10 +86,41 @@ msgid ""
 "###\n"
 "### Note that the name is shown but cannot be changed"
 msgstr ""
+"### Questa è una rappresentazione yaml di un pool di storage.\n"
+"### Le linee che iniziano con '# saranno ignorate.\n"
+"###\n"
+"### Un pool di storage consiste di un insieme di elementi di\n"
+"### configurazione.\n"
+"###\n"
+"### Un esempio è il seguente:\n"
+"### name: default\n"
+"### driver: zfs\n"
+"### used_by: []\n"
+"### config:\n"
+"###   size: \"61203283968\"\n"
+"###   source: /home/chb/mnt/lxd_test/default.img\n"
+"###   zfs.pool_name: default"
+
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+"### Questa è una rappresentazione yaml delle proprietà di\n"
+"### un'immagine.\n"
+"### Le linee che iniziano con '# saranno ignorate.\n"
+"###\n"
+"### Ogni proprietà è rappresentata da una singola linea.\n"
+"### Un esempio è il seguente:\n"
+"###  description: My custom image"
 
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -110,23 +142,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-"### Questa è una rappresentazione yaml delle proprietà di\n"
-"### un'immagine.\n"
-"### Le linee che iniziano con '# saranno ignorate.\n"
-"###\n"
-"### Ogni proprietà è rappresentata da una singola linea.\n"
-"### Un esempio è il seguente:\n"
-"###  description: My custom image"
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -200,7 +215,7 @@ msgstr ""
 "###   source: /home/chb/mnt/lxd_test/default.img\n"
 "###   zfs.pool_name: default"
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -229,38 +244,35 @@ msgstr "'%s' non è un tipo di file supportato."
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -289,7 +301,7 @@ msgid "Action (defaults to GET)"
 msgstr "Azione (default a GET)"
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -317,10 +329,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -348,22 +360,22 @@ msgstr "Nome dell'alias mancante"
 msgid "Aliases:"
 msgstr "Alias:"
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architettura: %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, fuzzy, c-format
 msgid "Architecture: %v"
 msgstr "Architettura: %s"
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -371,11 +383,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -383,14 +395,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -399,7 +411,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -439,19 +451,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr "Bytes ricevuti"
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr "Byte inviati"
 
@@ -463,20 +475,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr "NOME COMUNE"
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, fuzzy, c-format
 msgid "CPU (%s):"
 msgstr "Utilizzo CPU:"
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr "Utilizzo CPU (in secondi)"
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr "Utilizzo CPU:"
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -490,7 +502,7 @@ msgstr "CREATO IL"
 msgid "CREATED AT"
 msgstr "CREATO IL"
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -500,7 +512,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -550,12 +562,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -576,7 +588,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -610,7 +622,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -618,7 +630,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -632,32 +644,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -670,6 +669,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -682,15 +685,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -713,12 +715,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -726,18 +728,24 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+#, fuzzy
+msgid "Create a virtual machine"
+msgstr "Creazione del container in corso"
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
 #, fuzzy
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr "Creazione del container in corso"
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
-msgstr ""
+#, fuzzy
+msgid "Create and start instances from images"
+msgstr "Creazione del container in corso"
 
 #: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
@@ -745,30 +753,31 @@ msgstr ""
 
 #: lxc/snapshot.go:23
 #, fuzzy
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr "Creazione del container in corso"
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
 #, fuzzy
-msgid "Create containers from images"
+msgid "Create instances from images"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
-msgstr ""
-
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+#, fuzzy
+msgid "Create new instance file templates"
+msgstr "Creazione del container in corso"
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -786,14 +795,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -808,7 +813,7 @@ msgstr "Creazione di %s in corso"
 msgid "Creating the instance"
 msgstr "Creazione del container in corso"
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -826,7 +831,7 @@ msgstr "DESCRIZIONE"
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -842,17 +847,10 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
-msgstr ""
+#, fuzzy
+msgid "Delete files in instances"
+msgstr "Creazione del container in corso"
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
 msgid "Delete image aliases"
@@ -862,6 +860,15 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+#, fuzzy
+msgid "Delete instances and snapshots"
+msgstr "Creazione del container in corso"
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -903,7 +910,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -935,7 +942,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -943,7 +950,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -970,7 +977,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr "La periferica esiste già: %s"
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -995,21 +1002,21 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, fuzzy, c-format
 msgid "Disk %d:"
 msgstr "Utilizzo disco:"
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr "Utilizzo disco:"
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 #, fuzzy
 msgid "Disk:"
 msgstr "Utilizzo disco:"
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 #, fuzzy
 msgid "Disks:"
 msgstr "Utilizzo disco:"
@@ -1022,7 +1029,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1041,24 +1048,25 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
-msgstr ""
+#: lxc/file.go:153 lxc/file.go:154
+#, fuzzy
+msgid "Edit files in instances"
+msgstr "Creazione del container in corso"
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1087,14 +1095,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1110,7 +1118,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1123,19 +1131,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1163,12 +1171,12 @@ msgstr ""
 
 #: lxc/export.go:32
 #, fuzzy
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr "Creazione del container in corso"
 
 #: lxc/export.go:33
 #, fuzzy
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr "Creazione del container in corso"
 
 #: lxc/export.go:120
@@ -1236,11 +1244,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1255,12 +1263,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1279,26 +1287,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1315,11 +1323,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1350,7 +1358,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1358,12 +1366,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1395,12 +1403,12 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
 #, fuzzy
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr "Creazione del container in corso"
 
 #: lxc/image.go:1326
@@ -1434,14 +1442,9 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
-#: lxc/import.go:27
-#, fuzzy
-msgid "Import container backups"
-msgstr "Creazione del container in corso"
-
 #: lxc/image.go:605
 msgid ""
 "Import image into the image store\n"
@@ -1453,12 +1456,17 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+#, fuzzy
+msgid "Import instance backups"
+msgstr "Creazione del container in corso"
+
 #: lxc/import.go:72
 #, fuzzy, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr "Creazione del container in corso"
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1466,11 +1474,21 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+#, fuzzy
+msgid "Instance name is mandatory"
+msgstr "Il nome del container è: %s"
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Il nome del container è: %s"
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1540,11 +1558,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1579,12 +1597,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, fuzzy, c-format
 msgid "Link detected: %v"
 msgstr "Architettura: %s"
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1614,49 +1632,92 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
+#: lxc/config_device.go:260 lxc/config_device.go:261
+#, fuzzy
+msgid "List instance devices"
+msgstr "Creazione del container in corso"
+
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
 #, fuzzy
-msgid "List containers"
+msgid "List instances"
 msgstr "Creazione del container in corso"
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1674,12 +1735,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1694,48 +1755,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1760,12 +1779,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1778,7 +1797,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1805,7 +1824,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1816,26 +1835,9 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-#, fuzzy
-msgid "Manage container devices"
-msgstr "Creazione del container in corso"
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr "Creazione del container in corso"
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1850,8 +1852,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1865,6 +1867,24 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage instance devices"
+msgstr "Creazione del container in corso"
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#, fuzzy
+msgid "Manage instance metadata files"
+msgstr "Creazione del container in corso"
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1897,7 +1917,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1912,19 +1932,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1943,15 +1963,12 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
 #, fuzzy
-msgid "Missing container name"
+msgid "Missing instance name"
 msgstr "Il nome del container è: %s"
 
-#: lxc/profile.go:125
-msgid "Missing container.name name"
-msgstr ""
-
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
 #: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
 #: lxc/config_device.go:637
@@ -2000,12 +2017,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -2031,22 +2048,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -2057,7 +2073,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2066,11 +2082,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2079,30 +2095,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2131,7 +2147,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2168,13 +2184,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2206,7 +2222,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2231,15 +2247,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2250,24 +2266,24 @@ msgstr "Password amministratore per %s: "
 
 #: lxc/action.go:49 lxc/action.go:50
 #, fuzzy
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr "Creazione del container in corso"
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, fuzzy, c-format
 msgid "Port type: %s"
 msgstr "Aggiornamento automatico: %s"
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2297,7 +2313,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2307,7 +2323,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr "errore di processamento degli alias %s\n"
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2343,12 +2359,13 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
-msgstr ""
+#, fuzzy
+msgid "Profile to apply to the target instance"
+msgstr "non tutti i profili dell'origine esistono nella destinazione"
 
 #: lxc/profile.go:227
 #, c-format
@@ -2363,7 +2380,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2397,16 +2414,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, fuzzy, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr "Creazione del container in corso"
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2415,8 +2432,9 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
-msgstr ""
+#, fuzzy
+msgid "Push files into instances"
+msgstr "Creazione del container in corso"
 
 #: lxc/file.go:623 lxc/file.go:779
 #, c-format
@@ -2427,7 +2445,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2442,7 +2460,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, fuzzy, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr "Creazione del container in corso"
 
 #: lxc/image.go:1294
@@ -2479,12 +2497,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2503,11 +2521,12 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
-msgstr ""
+#, fuzzy
+msgid "Remove instance devices"
+msgstr "Creazione del container in corso"
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2528,8 +2547,9 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
-msgstr ""
+#, fuzzy
+msgid "Rename instances and snapshots"
+msgstr "Creazione del container in corso"
 
 #: lxc/network.go:960 lxc/network.go:961
 msgid "Rename networks"
@@ -2560,7 +2580,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2569,39 +2589,40 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
 #, fuzzy
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr "Creazione del container in corso"
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+#, fuzzy
+msgid "Restore instances from snapshots"
+msgstr "Creazione del container in corso"
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2610,7 +2631,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2625,7 +2646,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2671,21 +2692,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2693,16 +2714,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2794,20 +2815,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2819,13 +2828,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2858,10 +2879,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2871,6 +2888,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2895,7 +2916,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, fuzzy, c-format
 msgid "Size: %s"
 msgstr "Aggiornamento automatico: %s"
@@ -2904,19 +2925,19 @@ msgstr "Aggiornamento automatico: %s"
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
-#, c-format
-msgid "Some containers failed to %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Some instances failed to %s"
+msgstr "errore di processamento degli alias %s\n"
 
 #: lxc/image.go:936
 msgid "Source:"
@@ -2924,7 +2945,7 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
 #, fuzzy
-msgid "Start containers"
+msgid "Start instances"
 msgstr "Creazione del container in corso"
 
 #: lxc/launch.go:68
@@ -2937,27 +2958,27 @@ msgstr ""
 msgid "State: %s"
 msgstr "Aggiornamento automatico: %s"
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
-#, c-format
-msgid "Stopping the container failed: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Stopping the instance failed: %s"
+msgstr "Creazione del container in corso"
 
 #: lxc/storage.go:145
 #, c-format
@@ -2998,24 +3019,24 @@ msgstr ""
 
 #: lxc/action.go:114
 #, fuzzy
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr "Creazione del container in corso"
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -3036,11 +3057,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -3052,27 +3069,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr "La periferica esiste già"
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr "La periferica esiste già"
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3091,7 +3108,7 @@ msgid "The profile device doesn't exist"
 msgstr "il remote %s non esiste"
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3110,7 +3127,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3119,12 +3136,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3132,7 +3149,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3144,20 +3161,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3174,27 +3191,27 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
-#, c-format
-msgid "Transferring container: %s"
-msgstr ""
-
 #: lxc/image.go:725
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
+#: lxc/copy.go:354
+#, fuzzy, c-format
+msgid "Transferring instance: %s"
+msgstr "Creazione del container in corso"
+
 #: lxc/action.go:196 lxc/launch.go:99
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3212,7 +3229,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3234,15 +3251,15 @@ msgstr ""
 
 #: lxc/move.go:53
 #, fuzzy
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr "non tutti i profili dell'origine esistono nella destinazione"
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3265,6 +3282,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3275,7 +3297,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3293,27 +3315,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3334,12 +3356,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3357,11 +3379,12 @@ msgstr ""
 
 #: lxc/copy.go:82
 #, fuzzy
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr "Occorre specificare un nome di container come origine"
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+#, fuzzy
+msgid "You must specify a source instance name"
 msgstr "Occorre specificare un nome di container come origine"
 
 #: lxc/alias.go:52
@@ -3373,12 +3396,14 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
-msgstr ""
+#, fuzzy
+msgid "add [<remote>:]<instance> <profile>"
+msgstr "Creazione del container in corso"
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
-msgstr ""
+#, fuzzy
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgstr "Creazione del container in corso"
 
 #: lxc/remote.go:83
 msgid "add [<remote>] <IP|FQDN|URL>"
@@ -3390,16 +3415,16 @@ msgid "alias"
 msgstr "Alias:"
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3422,7 +3447,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3446,8 +3471,9 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "create [<remote>:]<instance> <template>"
+msgstr "Creazione del container in corso"
 
 #: lxc/network.go:252
 msgid "create [<remote>:]<network> [key=value...]"
@@ -3481,23 +3507,25 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
-#: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
+#: lxc/config_template.go:106
+#, fuzzy
+msgid "delete [<remote>:]<instance> <template>"
+msgstr "Creazione del container in corso"
+
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
+#, fuzzy
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
-msgstr ""
-
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
+msgstr "Creazione del container in corso"
 
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
@@ -3528,11 +3556,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3540,7 +3568,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3555,21 +3583,24 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
-#: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
 msgstr ""
 
+#: lxc/config_metadata.go:51
+#, fuzzy
+msgid "edit [<remote>:]<instance>"
+msgstr "Creazione del container in corso"
+
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "edit [<remote>:]<instance> <template>"
+msgstr "Creazione del container in corso"
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
-msgstr ""
+#, fuzzy
+msgid "edit [<remote>:]<instance>/<path>"
+msgstr "Creazione del container in corso"
 
 #: lxc/network.go:544
 msgid "edit [<remote>:]<network>"
@@ -3593,7 +3624,7 @@ msgstr ""
 
 #: lxc/config.go:88
 #, fuzzy
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "Creazione del container in corso"
 
 #: lxc/cluster.go:329
@@ -3610,31 +3641,31 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
-msgstr ""
+#, fuzzy
+msgid "get [<remote>:]<instance|profile> <device> <key>"
+msgstr "Creazione del container in corso"
 
 #: lxc/network.go:667
 msgid "get [<remote>:]<network> <key>"
@@ -3657,8 +3688,9 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
-msgstr ""
+#, fuzzy
+msgid "get [<remote>:][<instance>] <key>"
+msgstr "Creazione del container in corso"
 
 #: lxc/remote.go:417
 msgid "get-default"
@@ -3694,9 +3726,10 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
-msgstr ""
+#: lxc/info.go:31
+#, fuzzy
+msgid "info [<remote>:][<instance>]"
+msgstr "Creazione del container in corso"
 
 #: lxc/init.go:38
 msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
@@ -3724,12 +3757,14 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
-msgstr ""
+#, fuzzy
+msgid "list [<remote>:]<instance>"
+msgstr "Creazione del container in corso"
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
-msgstr ""
+#, fuzzy
+msgid "list [<remote>:]<instance|profile>"
+msgstr "Creazione del container in corso"
 
 #: lxc/storage_volume.go:1066
 msgid "list [<remote>:]<pool>"
@@ -3759,21 +3794,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3785,20 +3820,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3813,13 +3848,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3830,7 +3865,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3838,17 +3873,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3869,15 +3904,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3903,7 +3938,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3920,8 +3955,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3979,10 +4014,10 @@ msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
 #: lxc/move.go:34
+#, fuzzy
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
-msgstr ""
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
+msgstr "Creazione del container in corso"
 
 #: lxc/storage.go:444
 msgid "name"
@@ -4005,12 +4040,14 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
-msgstr ""
+#, fuzzy
+msgid "override [<remote>:]<instance> <device> [key=value...]"
+msgstr "Creazione del container in corso"
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
-msgstr ""
+#, fuzzy
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr "Creazione del container in corso"
 
 #: lxc/config.go:54
 msgid "please use `lxc profile`"
@@ -4026,19 +4063,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -4067,12 +4103,14 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
-msgstr ""
+#, fuzzy
+msgid "remove [<remote>:]<instance> <profile>"
+msgstr "Creazione del container in corso"
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
-msgstr ""
+#, fuzzy
+msgid "remove [<remote>:]<instance|profile> <name>..."
+msgstr "Creazione del container in corso"
 
 #: lxc/cluster.go:243
 msgid "remove [<remote>:]<member>"
@@ -4091,8 +4129,9 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
-msgstr ""
+#, fuzzy
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
+msgstr "Creazione del container in corso"
 
 #: lxc/cluster.go:193
 msgid "rename [<remote>:]<member> <new-name>"
@@ -4117,20 +4156,23 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
-msgstr ""
+#, fuzzy
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr "Creazione del container in corso"
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
-msgstr ""
+#, fuzzy
+msgid "restore [<remote>:]<instance> <snapshot>"
+msgstr "Creazione del container in corso"
 
 #: lxc/storage_volume.go:1561
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
-msgstr ""
+#, fuzzy
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+msgstr "Creazione del container in corso"
 
 #: lxc/network.go:1009
 msgid "set [<remote>:]<network> <key>=<value>..."
@@ -4154,28 +4196,31 @@ msgstr ""
 
 #: lxc/config.go:452
 #, fuzzy
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr "Creazione del container in corso"
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
 msgstr ""
 
+#: lxc/config_metadata.go:173
+#, fuzzy
+msgid "show [<remote>:]<instance>"
+msgstr "Creazione del container in corso"
+
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "show [<remote>:]<instance> <template>"
+msgstr "Creazione del container in corso"
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
-msgstr ""
+#, fuzzy
+msgid "show [<remote>:]<instance|profile>"
+msgstr "Creazione del container in corso"
 
 #: lxc/cluster.go:144
 msgid "show [<remote>:]<member>"
@@ -4207,12 +4252,13 @@ msgstr ""
 
 #: lxc/config.go:578
 #, fuzzy
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr "Creazione del container in corso"
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
-msgstr ""
+#, fuzzy
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
+msgstr "Creazione del container in corso"
 
 #: lxc/storage_volume.go:1490
 msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
@@ -4223,20 +4269,22 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
-msgstr ""
+#, fuzzy
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr "Creazione del container in corso"
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr "senza stato"
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
-msgstr ""
+#, fuzzy
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
+msgstr "Creazione del container in corso"
 
 #: lxc/storage.go:31
 msgid "storage"
@@ -4250,7 +4298,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr "salvato alle %s"
@@ -4272,8 +4320,9 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
-msgstr ""
+#, fuzzy
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
+msgstr "Creazione del container in corso"
 
 #: lxc/network.go:1141
 msgid "unset [<remote>:]<network> <key>"
@@ -4296,8 +4345,9 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
-msgstr ""
+#, fuzzy
+msgid "unset [<remote>:][<instance>] <key>"
+msgstr "Creazione del container in corso"
 
 #: lxc/storage.go:442
 msgid "used by"
diff --git a/po/ja.po b/po/ja.po
index ccac457659..b57c7ed663 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: 2019-09-20 11:43+0000\n"
 "Last-Translator: Hiroaki Nakamura <hnakamur at gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -56,7 +56,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -71,9 +71,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -95,16 +105,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -163,7 +163,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -193,38 +193,37 @@ msgstr "'%s' はサポートされないタイプのファイルです"
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr "- パーティション %d"
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr "- ポート %d (%s)"
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr "--container-only はコピー元がスナップショットの場合は指定できません"
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr "--empty はイメージ名と同時に指定できません"
 
+#: lxc/copy.go:153
+#, fuzzy
+msgid "--instance-only can't be passed when the source is a snapshot"
+msgstr "--container-only はコピー元がスナップショットの場合は指定できません"
+
 #: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#, fuzzy
+msgid "--refresh can only be used with instances"
 msgstr "--refresh はコンテナの場合のみ使えます"
 
 #: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
-msgstr "--target はコンテナでは使えません"
-
-#: lxc/info.go:423
+#: lxc/info.go:424
 #, fuzzy
 msgid "--target cannot be used with instances"
 msgstr "--target はコンテナでは使えません"
@@ -254,7 +253,8 @@ msgid "Action (defaults to GET)"
 msgstr "使用するHTTPのメソッド (デフォルト: GET)"
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+#, fuzzy
+msgid "Add devices to instances or profiles"
 msgstr "コンテナもしくはプロファイルにデバイスを追加します"
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -289,10 +289,11 @@ msgid "Add new trusted clients"
 msgstr "新たに信頼済みのクライアントを追加します"
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+#, fuzzy
+msgid "Add profiles to instances"
 msgstr "コンテナにプロファイルを追加します"
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr "アドレス: %s"
@@ -320,22 +321,24 @@ msgstr "エイリアスを指定してください"
 msgid "Aliases:"
 msgstr "エイリアス:"
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr "アーキテクチャ: %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr "アーキテクチャ: %v"
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+#, fuzzy
+msgid "Assign sets of profiles to instances"
 msgstr "コンテナにプロファイルを割り当てます"
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+#, fuzzy
+msgid "Attach network interfaces to instances"
 msgstr "コンテナにネットワークインターフェースを追加します"
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -343,11 +346,13 @@ msgid "Attach network interfaces to profiles"
 msgstr "プロファイルにネットワークインターフェースを追加します"
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+#, fuzzy
+msgid "Attach new network interfaces to instances"
 msgstr "新たなネットワークインターフェースをコンテナに追加します"
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+#, fuzzy
+msgid "Attach new storage volumes to instances"
 msgstr "新たにストレージボリュームをコンテナに追加します"
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -355,14 +360,16 @@ msgid "Attach new storage volumes to profiles"
 msgstr "新しいストレージボリュームをプロファイルに追加します"
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+#, fuzzy
+msgid "Attach to instance consoles"
 msgstr "コンテナのコンソールに接続します"
 
 #: lxc/console.go:32
+#, fuzzy
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 "コンテナのコンソールに接続します\n"
@@ -375,7 +382,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr "認証タイプ '%s' はサーバではサポートされていません"
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr "オートネゴシエーション: %v"
@@ -416,19 +423,20 @@ msgstr ""
 "書式が不適切です。次のような形式で指定してください <device>,<key>=<value>: %s"
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+#, fuzzy
+msgid "Both --all and instance name given"
 msgstr "--all とコンテナ名を両方同時に指定することはできません"
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr "ブランド: %v"
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr "受信バイト数"
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr "送信バイト数"
 
@@ -440,20 +448,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr "CPU (%s):"
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr "CPU使用量(秒)"
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr "CPU使用量:"
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -466,7 +474,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr "CUDA バージョン: %v"
@@ -476,7 +484,7 @@ msgstr "CUDA バージョン: %v"
 msgid "Cached: %s"
 msgstr "キャッシュ済: %s"
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr "キャッシュ:"
 
@@ -527,12 +535,12 @@ msgstr "キー '%s' が設定されていないので削除できません"
 msgid "Candid domain to use"
 msgstr "使用する Candid ドメイン"
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr "カード %d:"
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr "カード: %s (%s)"
@@ -553,7 +561,7 @@ msgid "Client version: %s\n"
 msgstr "クライアントバージョン: %s\n"
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -591,7 +599,8 @@ msgstr ""
 "コマンドのヘルプは、--help をコマンドに付けて実行するだけです。"
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+#, fuzzy
+msgid "Config key/value to apply to the new instance"
 msgstr "新しいコンテナに適用するキー/値の設定"
 
 #: lxc/project.go:88
@@ -599,7 +608,8 @@ msgid "Config key/value to apply to the new project"
 msgstr "新しいプロジェクトに適用するキー/値の設定"
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+#, fuzzy
+msgid "Config key/value to apply to the target instance"
 msgstr "移動先のコンテナに適用するキー/値の設定"
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -613,32 +623,20 @@ msgstr "設定の構文エラー: %s"
 msgid "Console log:"
 msgstr "コンソールログ:"
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr "コンテナ名を指定する必要があります"
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr "コンテナは以下のフィンガープリントで publish されます: %s"
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+#, fuzzy
+msgid "Copy a stateful instance stateless"
 msgstr "ステートフルなコンテナをステートレスにコピーします"
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "ソースからエイリアスをコピーしました"
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr "LXD インスタンス内に、またはインスタンス間でコンテナをコピーします"
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr "サーバ間でイメージをコピーします"
@@ -655,6 +653,11 @@ msgstr ""
 "自動更新フラグは、このイメージを最新に保つようにサーバに指示します。\n"
 "ソースはエイリアスで、かつパブリックである必要があります。"
 
+#: lxc/copy.go:40 lxc/copy.go:41
+#, fuzzy
+msgid "Copy instances within or in between LXD servers"
+msgstr "LXD インスタンス内に、またはインスタンス間でコンテナをコピーします"
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr "プロファイルに継承されたデバイスをコピーし、設定キーを上書きします"
@@ -667,15 +670,14 @@ msgstr "プロファイルをコピーします"
 msgid "Copy storage volumes"
 msgstr "ストレージボリュームをコピーします"
 
-#: lxc/copy.go:51
+#: lxc/copy.go:50
 #, fuzzy
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
+msgid "Copy the instance without its snapshots"
 msgstr "コンテナをコピーします (スナップショットはコピーしません)"
 
-#: lxc/copy.go:50
+#: lxc/copy.go:51
 #, fuzzy
-msgid "Copy the instance without its snapshots"
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
 msgstr "コンテナをコピーします (スナップショットはコピーしません)"
 
 #: lxc/storage_volume.go:306
@@ -701,12 +703,12 @@ msgstr "イメージのコピー中: %s"
 msgid "Copying the storage volume: %s"
 msgstr "ストレージボリュームのコピー中: %s"
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr "コア %d"
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr "コア:"
 
@@ -714,16 +716,23 @@ msgstr "コア:"
 msgid "Could not create server cert dir"
 msgstr "サーバ証明書格納用のディレクトリを作成できません"
 
+#: lxc/init.go:57
+#, fuzzy
+msgid "Create a virtual machine"
+msgstr "イメージのコピー中: %s"
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr "既存のイメージに対するエイリアスを作成します"
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+#, fuzzy
+msgid "Create an empty instance"
 msgstr "空のコンテナを作成"
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+#, fuzzy
+msgid "Create and start instances from images"
 msgstr "イメージからコンテナを作成し、起動します"
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -731,14 +740,16 @@ msgid "Create any directories necessary"
 msgstr "必要なディレクトリをすべて作成します"
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+#, fuzzy
+msgid "Create instance snapshots"
 msgstr "コンテナのスナップショットを作成します"
 
 #: lxc/snapshot.go:24
+#, fuzzy
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 "コンテナのスナップショットを作成します\n"
@@ -747,17 +758,19 @@ msgstr ""
 "コネクション、など…を含む)を保存しようとします。"
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
+#, fuzzy
+msgid "Create instances from images"
 msgstr "イメージからコンテナを作成します"
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
-msgstr "新たにコンテナのファイルテンプレートを作成します"
-
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr "新たにカスタムストレージボリュームを作成します"
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+#, fuzzy
+msgid "Create new instance file templates"
+msgstr "新たにコンテナのファイルテンプレートを作成します"
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr "新たにネットワークを作成します"
@@ -775,15 +788,11 @@ msgid "Create storage pools"
 msgstr "ストレージプールを作成します"
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr "プロファイルを適用しないコンテナを作成します"
-
-#: lxc/init.go:57
 #, fuzzy
-msgid "Create virtual machine"
-msgstr "イメージのコピー中: %s"
+msgid "Create the instance with no profiles applied"
+msgstr "プロファイルを適用しないコンテナを作成します"
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr "作成日時: %s"
@@ -798,7 +807,7 @@ msgstr "%s を作成中"
 msgid "Creating the instance"
 msgstr "コンテナを作成中"
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr "現在の VF 数: %d"
@@ -816,7 +825,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -833,16 +842,9 @@ msgstr "圧縮アルゴリズムを指定します: 圧縮アルゴリズム名
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr "バックグラウンドの操作を削除します(キャンセルを試みます)"
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr "コンテナのファイルテンプレートを削除します"
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr "コンテナとスナップショットを削除します"
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+#, fuzzy
+msgid "Delete files in instances"
 msgstr "コンテナ内のファイルを削除します"
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -853,6 +855,16 @@ msgstr "イメージのエイリアスを削除します"
 msgid "Delete images"
 msgstr "イメージを削除します"
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+#, fuzzy
+msgid "Delete instance file templates"
+msgstr "コンテナのファイルテンプレートを削除します"
+
+#: lxc/delete.go:29 lxc/delete.go:30
+#, fuzzy
+msgid "Delete instances and snapshots"
+msgstr "コンテナとスナップショットを削除します"
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr "ネットワークを削除します"
@@ -894,7 +906,7 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -926,7 +938,8 @@ msgid "Description"
 msgstr "説明"
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+#, fuzzy
+msgid "Detach network interfaces from instances"
 msgstr "コンテナからネットワークインターフェースを取り外します"
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -934,7 +947,8 @@ msgid "Detach network interfaces from profiles"
 msgstr "プロファイルからネットワークインターフェースを取り外します"
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+#, fuzzy
+msgid "Detach storage volumes from instances"
 msgstr "コンテナからストレージボリュームを取り外します"
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -961,7 +975,7 @@ msgstr "デバイス %s が %s から削除されました"
 msgid "Device already exists: %s"
 msgstr "デバイスは既に存在します: %s"
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr "デバイス: %s"
@@ -990,20 +1004,20 @@ msgstr "擬似端末の割り当てを無効にします"
 msgid "Disable stdin (reads from /dev/null)"
 msgstr "標準入力を無効にします (/dev/null から読み込みます)"
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr "ディスク %d:"
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr "ディスク使用量:"
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr "ディスク:"
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr "ディスク:"
 
@@ -1015,7 +1029,7 @@ msgstr "--force を使う際にユーザーの確認を必要としない"
 msgid "Don't show progress information"
 msgstr "進捗情報を表示しません"
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr "ドライバ: %v (%v)"
@@ -1036,26 +1050,30 @@ msgstr ""
 "ファイル転送のサーバ側の初期処理はキャンセルできません(強制的に中断するには"
 "あと2回行ってください)"
 
+#: lxc/file.go:153 lxc/file.go:154
+#, fuzzy
+msgid "Edit files in instances"
+msgstr "コンテナ内のファイルを編集します"
+
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
+msgstr "イメージのプロパティを編集します"
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#, fuzzy
+msgid "Edit instance file templates"
 msgstr "コンテナのファイルテンプレートを編集します"
 
 #: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#, fuzzy
+msgid "Edit instance metadata files"
 msgstr "コンテナのメタデータファイルを編集します"
 
 #: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#, fuzzy
+msgid "Edit instance or server configurations as YAML"
 msgstr "コンテナもしくはサーバの設定をYAMLファイルで編集します"
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
-msgstr "コンテナ内のファイルを編集します"
-
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
-msgstr "イメージのプロパティを編集します"
-
 #: lxc/network.go:545 lxc/network.go:546
 msgid "Edit network configurations as YAML"
 msgstr "ネットワーク設定をYAMLで編集します"
@@ -1083,15 +1101,17 @@ msgstr ""
 "'%s' 中のカラムエントリが空です (カラムの指定に空文字列が指定されています)"
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+#, fuzzy
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 "クラスタリングで動作していないLXDインスタンス上でクラスタリングを有効にします"
 
 #: lxc/cluster.go:331
+#, fuzzy
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1116,7 +1136,8 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "環境変数を設定します (例: HOME=/home/foo)"
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+#, fuzzy
+msgid "Ephemeral instance"
 msgstr "Ephemeral コンテナ"
 
 #: lxc/config_template.go:203
@@ -1129,19 +1150,21 @@ msgid "Event type to listen for"
 msgstr "Listenするイベントタイプ"
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+#, fuzzy
+msgid "Execute commands in instances"
 msgstr "コンテナ内でコマンドを実行します"
 
 #: lxc/exec.go:41
+#, fuzzy
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1182,11 +1205,13 @@ msgstr ""
 "出力先はオプショナルで、デフォルトは現在のディレクトリです。"
 
 #: lxc/export.go:32
-msgid "Export container backups"
+#, fuzzy
+msgid "Export instance backups"
 msgstr "コンテナのバックアップをエクスポートします"
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+#, fuzzy
+msgid "Export instances as backup tarballs."
 msgstr "コンテナを tarball 形式のバックアップとしてエクスポートします。"
 
 #: lxc/export.go:120
@@ -1254,11 +1279,13 @@ msgid "Force removing a member, even if degraded"
 msgstr "degraded 状態であっても強制的にメンバを削除します"
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+#, fuzzy
+msgid "Force the instance to shutdown"
 msgstr "コンテナを強制シャットダウンします"
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+#, fuzzy
+msgid "Force the removal of running instances"
 msgstr "稼働中のコンテナを強制的に削除します"
 
 #: lxc/main.go:62
@@ -1266,19 +1293,19 @@ msgid "Force using the local unix socket"
 msgstr "強制的にローカルのUNIXソケットを使います"
 
 #: lxc/cluster.go:258
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
 "resort.\n"
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1312,26 +1339,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr "フォーマット (csv|json|table|yaml)"
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr "空き: %v"
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr "クロック数: %vMhz"
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr "クロック数: %vMhz (最小: %vMhz, 最大: %vMhz)"
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1348,11 +1375,13 @@ msgid "Get runtime information on networks"
 msgstr "ネットワークのランタイム情報を取得します"
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+#, fuzzy
+msgid "Get values for instance device configuration keys"
 msgstr "コンテナのデバイスの設定値を取得します"
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+#, fuzzy
+msgid "Get values for instance or server configuration keys"
 msgstr "コンテナもしくはサーバの設定値を取得します"
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1383,7 +1412,7 @@ msgstr "コマンドを実行する際のグループ ID (GID) (デフォルト
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1391,12 +1420,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr "ID: %d"
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1428,11 +1457,13 @@ msgid ""
 msgstr "初めてこのマシンで LXD を使う場合、lxd init と実行する必要があります"
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+#, fuzzy
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr "設定されている自動でのコンテナの有効期限設定を無視します"
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+#, fuzzy
+msgid "Ignore the instance state"
 msgstr "コンテナの状態を無視します"
 
 #: lxc/image.go:1326
@@ -1466,14 +1497,11 @@ msgid "Image refreshed successfully!"
 msgstr "イメージの更新が成功しました!"
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
+#, fuzzy
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 "コンテナのバックアップをスナップショットを含んだ状態でインポートします。"
 
-#: lxc/import.go:27
-msgid "Import container backups"
-msgstr "コンテナのバックアップをインポートします"
-
 #: lxc/image.go:605
 msgid ""
 "Import image into the image store\n"
@@ -1489,12 +1517,17 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr "イメージをイメージストアにインポートします"
 
+#: lxc/import.go:27
+#, fuzzy
+msgid "Import instance backups"
+msgstr "コンテナのバックアップをインポートします"
+
 #: lxc/import.go:72
-#, c-format
-msgid "Importing container: %s"
+#, fuzzy, c-format
+msgid "Importing instance: %s"
 msgstr "コンテナのインポート中: %s"
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1502,11 +1535,21 @@ msgstr ""
 msgid "Input data"
 msgstr "入力するデータ"
 
+#: lxc/publish.go:80
+#, fuzzy
+msgid "Instance name is mandatory"
+msgstr "コンテナ名を指定する必要があります"
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "コンテナ名: %s"
 
+#: lxc/publish.go:276
+#, fuzzy, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr "コンテナは以下のフィンガープリントで publish されます: %s"
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr "インスタンスタイプ"
@@ -1579,11 +1622,11 @@ msgstr "不正なソース %s"
 msgid "Invalid target %s"
 msgstr "不正な送り先 %s"
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr "IPアドレス:"
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr "IsSM: %s (%s)"
@@ -1618,12 +1661,12 @@ msgstr "最終使用: %s"
 msgid "Last used: never"
 msgstr "最終使用: 未使用"
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr "リンクを検出: %v"
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr "リンクスピード: %dMbit/s (%s duplex)"
@@ -1652,49 +1695,122 @@ msgstr "利用可能なストレージプールを一覧表示します"
 msgid "List background operations"
 msgstr "バックグラウンド操作を一覧表示します"
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr "イメージのエイリアスを一覧表示します"
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+"イメージのエイリアスを一覧表示します\n"
+"\n"
+"指定するフィルタはイメージのハッシュ値の一部でもイメージのエイリアスの一部で"
+"も構いません。\n"
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr "イメージを一覧表示します"
+
+#: lxc/image.go:968
+#, fuzzy
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+"イメージをリスト表示します\n"
+"\n"
+"プロパティでフィルタを行う場合、イメージのハッシュ値やイメージのエイリアスの"
+"一部を指定する場合、\n"
+"は、フィルタは <key>=<value> の形になります。\n"
+"\n"
+"-c オプションは、表もしくは csv 形式で表示する際の、出力するイメージの\n"
+"属性を指定する引数のリスト (カンマ区切りでも OK) を指定します。\n"
+"\n"
+"デフォルトのカラムレイアウトは lfpdasu です。\n"
+"\n"
+"カラムの指定文字:\n"
+"\n"
+"    l - もっとも短いイメージのエイリアス (他の指定されているエイリアスの数も"
+"表示します)\n"
+"    L - イメージのエイリアスすべて (改行区切り)\n"
+"    f - フィンガープリント (短い形式)\n"
+"    F - フィンガープリント (長い形式)\n"
+"    p - イメージがパブリックかどうか\n"
+"    d - 説明\n"
+"    a - アーキテクチャ\n"
+"    s - サイズ\n"
+"    u - アップロード日"
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+#, fuzzy
+msgid "List instance devices"
 msgstr "コンテナのデバイスを一覧表示します"
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+#, fuzzy
+msgid "List instance file templates"
 msgstr "コンテナのファイルテンプレートを一覧表示します"
 
 #: lxc/list.go:43
-msgid "List containers"
+#, fuzzy
+msgid "List instances"
 msgstr "コンテナを一覧表示します"
 
 #: lxc/list.go:44
 #, fuzzy
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1712,12 +1828,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1792,76 +1908,6 @@ msgstr ""
 "MAXWIDTH: カラムの最大幅 (結果がこれより長い場合は切り詰められます)\n"
 "          デフォルトは -1 (制限なし)。0 はカラムのヘッダサイズに制限します。"
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr "イメージのエイリアスを一覧表示します"
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-"イメージのエイリアスを一覧表示します\n"
-"\n"
-"指定するフィルタはイメージのハッシュ値の一部でもイメージのエイリアスの一部で"
-"も構いません。\n"
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr "イメージを一覧表示します"
-
-#: lxc/image.go:968
-#, fuzzy
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-"イメージをリスト表示します\n"
-"\n"
-"プロパティでフィルタを行う場合、イメージのハッシュ値やイメージのエイリアスの"
-"一部を指定する場合、\n"
-"は、フィルタは <key>=<value> の形になります。\n"
-"\n"
-"-c オプションは、表もしくは csv 形式で表示する際の、出力するイメージの\n"
-"属性を指定する引数のリスト (カンマ区切りでも OK) を指定します。\n"
-"\n"
-"デフォルトのカラムレイアウトは lfpdasu です。\n"
-"\n"
-"カラムの指定文字:\n"
-"\n"
-"    l - もっとも短いイメージのエイリアス (他の指定されているエイリアスの数も"
-"表示します)\n"
-"    L - イメージのエイリアスすべて (改行区切り)\n"
-"    f - フィンガープリント (短い形式)\n"
-"    F - フィンガープリント (長い形式)\n"
-"    p - イメージがパブリックかどうか\n"
-"    d - 説明\n"
-"    a - アーキテクチャ\n"
-"    s - サイズ\n"
-"    u - アップロード日"
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr "プロファイルを一覧表示します"
@@ -1886,12 +1932,12 @@ msgstr "信頼済みクライアントを一覧表示します"
 msgid "List, show and delete background operations"
 msgstr "バックグラウンド操作の一覧表示、表示、削除を行います"
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr "ロケーション: %s"
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr "ログ:"
 
@@ -1904,7 +1950,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr "MAC アドレス: %s"
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr "MAD: %s (%s)"
@@ -1931,7 +1977,8 @@ msgid "Make the image public"
 msgstr "イメージを public にする"
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+#, fuzzy
+msgid "Manage and attach instances to networks"
 msgstr "ネットワークを管理し、コンテナをネットワークに接続します"
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1942,24 +1989,9 @@ msgstr "クラスタのメンバを管理します"
 msgid "Manage command aliases"
 msgstr "コマンドのエイリアスを管理します"
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr "コンテナやサーバの設定を管理します"
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr "コンテナのデバイスを管理します"
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr "コンテナのファイルテンプレートを管理します"
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr "コンテナのメタデータファイルを管理します"
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+#, fuzzy
+msgid "Manage files in instances"
 msgstr "コンテナ内のファイルを管理します"
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1971,11 +2003,12 @@ msgid "Manage images"
 msgstr "イメージを管理します"
 
 #: lxc/image.go:38
+#, fuzzy
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -2002,6 +2035,26 @@ msgstr ""
 "イメージは全ハッシュ文字列、一意に定まるハッシュの短縮表現、(設定され\n"
 "ている場合は) エイリアスで参照できます。"
 
+#: lxc/config.go:30 lxc/config.go:31
+#, fuzzy
+msgid "Manage instance and server configuration options"
+msgstr "コンテナやサーバの設定を管理します"
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage instance devices"
+msgstr "コンテナのデバイスを管理します"
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+#, fuzzy
+msgid "Manage instance file templates"
+msgstr "コンテナのファイルテンプレートを管理します"
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#, fuzzy
+msgid "Manage instance metadata files"
+msgstr "コンテナのメタデータファイルを管理します"
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr "プロファイルを管理します"
@@ -2038,7 +2091,7 @@ msgstr "リモートサーバのリストを管理します"
 msgid "Manage trusted clients"
 msgstr "信頼済みのクライアントを管理します"
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr "VF の最大数: %d"
@@ -2053,19 +2106,19 @@ msgstr "メンバ %s が削除されました"
 msgid "Member %s renamed to %s"
 msgstr "メンバ名 %s を %s に変更しました"
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr "メモリ (現在値)"
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr "メモリ (ピーク)"
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr "メモリ消費量:"
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr "メモリ:"
 
@@ -2084,12 +2137,10 @@ msgstr "表示するログメッセージの最小レベル"
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr "コンテナ名を指定する必要があります"
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+#, fuzzy
+msgid "Missing instance name"
 msgstr "コンテナ名を指定する必要があります"
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -2139,12 +2190,12 @@ msgstr "コピー元のボリューム名を指定する必要があります"
 msgid "Missing target directory"
 msgstr "コピー先のディレクトリを指定する必要があります"
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr "モデル: %s"
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr "モデル: %v"
@@ -2175,22 +2226,22 @@ msgstr ""
 "せん"
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+#, fuzzy
+msgid "Move instances within or in between LXD servers"
 msgstr "LXD サーバ内もしくはサーバ間でコンテナを移動します"
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr "プール間でストレージボリュームを移動します"
 
-#: lxc/move.go:54
+#: lxc/move.go:55
 #, fuzzy
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr "コンテナを移動します (スナップショットは移動しません)"
 
-#: lxc/move.go:55
+#: lxc/move.go:54
 #, fuzzy
-msgid "Move the instance without its snapshots"
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
 msgstr "コンテナを移動します (スナップショットは移動しません)"
 
 #: lxc/storage_volume.go:365
@@ -2203,7 +2254,8 @@ msgid "Must run as root to import from directory"
 msgstr "ディレクトリからのインポートは root で実行する必要があります"
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+#, fuzzy
+msgid "Must supply instance name for: "
 msgstr "コンテナ名を指定する必要があります: "
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2212,11 +2264,11 @@ msgstr "コンテナ名を指定する必要があります: "
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2225,30 +2277,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr "NUMA ノード: %v"
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr "NUMA ノード:\n"
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr "NVIDIA 情報:"
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr "NVRM バージョン: %v"
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr "名前: %v"
@@ -2277,7 +2329,7 @@ msgstr "ネットワーク名 %s を %s に変更しました"
 msgid "Network name"
 msgstr "ネットワーク名:"
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr "ネットワーク使用状況:"
 
@@ -2314,13 +2366,14 @@ msgstr "コピー先のボリュームに対するストレージプールが指
 msgid "No value found in %q"
 msgstr "%q に設定する値が指定されていません"
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr "ノード %d:\n"
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+#, fuzzy
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr "\"カスタム\" のボリュームのみがコンテナにアタッチできます"
 
 #: lxc/storage_volume.go:1523
@@ -2352,7 +2405,7 @@ msgstr "プロジェクトを指定します"
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr "ターミナルモードを上書きします (auto, interactive, non-interactive)"
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr "PCI アドレス: %v"
@@ -2377,15 +2430,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr "受信パケット"
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr "送信パケット"
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr "パーティション:"
 
@@ -2395,24 +2448,25 @@ msgid "Password for %s: "
 msgstr "%s のパスワード: "
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+#, fuzzy
+msgid "Pause instances"
 msgstr "コンテナを一時停止します"
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr "インクリメンタルコピーを実行します"
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr "Pid: %d"
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr "ポートタイプ: %s"
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr "ポート:"
 
@@ -2442,7 +2496,7 @@ msgstr "レスポンスをそのまま表示します"
 msgid "Print version number"
 msgstr "バージョン番号を表示します"
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr "プロセス数: %d"
@@ -2452,7 +2506,7 @@ msgstr "プロセス数: %d"
 msgid "Processing aliases failed: %s"
 msgstr "エイリアスの処理が失敗しました: %s"
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr "製品名: %v (%v)"
@@ -2488,11 +2542,13 @@ msgid "Profile %s renamed to %s"
 msgstr "プロファイル名 %s を %s に変更しました"
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+#, fuzzy
+msgid "Profile to apply to the new instance"
 msgstr "新しいコンテナに適用するプロファイル"
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+#, fuzzy
+msgid "Profile to apply to the target instance"
 msgstr "移動先のコンテナに適用するプロファイル"
 
 #: lxc/profile.go:227
@@ -2510,7 +2566,7 @@ msgstr "プロファイル: %s"
 msgid "Profiles: "
 msgstr "プロファイル: %s"
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr "プロファイル: %s"
@@ -2544,16 +2600,18 @@ msgid "Public: %s"
 msgstr "パブリック: %s"
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+#, fuzzy
+msgid "Publish instances as images"
 msgstr "コンテナをイメージとして出力します"
 
 #: lxc/publish.go:222
-#, c-format
-msgid "Publishing container: %s"
+#, fuzzy, c-format
+msgid "Publishing instance: %s"
 msgstr "コンテナの出力中: %s"
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+#, fuzzy
+msgid "Pull files from instances"
 msgstr "コンテナからファイルを取得します"
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2562,7 +2620,8 @@ msgid "Pulling %s from %s: %%s"
 msgstr "ファイル %s を %s から取得します: %%s"
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+#, fuzzy
+msgid "Push files into instances"
 msgstr "コンテナ内にファイルをコピーします"
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2574,7 +2633,7 @@ msgstr "ファイル %s をコンテナ %s 内にコピーします: %%s"
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr "読み取り専用: %v"
@@ -2588,8 +2647,8 @@ msgid "Refresh images"
 msgstr "イメージを更新します"
 
 #: lxc/copy.go:388
-#, c-format
-msgid "Refreshing container: %s"
+#, fuzzy, c-format
+msgid "Refreshing instance: %s"
 msgstr "コンテナの更新中: %s"
 
 #: lxc/image.go:1294
@@ -2626,12 +2685,12 @@ msgstr "リモートの管理者パスワード"
 msgid "Remote operation canceled by user"
 msgstr "リモート操作がユーザによってキャンセルされました"
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr "リモート名: %s"
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr "リムーバブルディスク: %v"
@@ -2650,11 +2709,13 @@ msgid "Remove aliases"
 msgstr "エイリアスを削除します"
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+#, fuzzy
+msgid "Remove instance devices"
 msgstr "コンテナのデバイスを削除します"
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+#, fuzzy
+msgid "Remove profiles from instances"
 msgstr "コンテナからプロファイルを削除します"
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2675,7 +2736,8 @@ msgid "Rename aliases"
 msgstr "エイリアスの名前を変更します"
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+#, fuzzy
+msgid "Rename instances and snapshots"
 msgstr "コンテナまたはコンテナのスナップショットの名前を変更します"
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2708,7 +2770,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr "ストレージボリューム名 \"%s\" を \"%s\" に変更しました"
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2717,17 +2779,19 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr "ユーザの確認を要求する"
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr "リソース:"
 
 #: lxc/action.go:69
-msgid "Restart containers"
+#, fuzzy
+msgid "Restart insances"
 msgstr "コンテナを再起動します"
 
 #: lxc/action.go:70
+#, fuzzy
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
@@ -2735,13 +2799,10 @@ msgstr ""
 "\n"
 "\"lxc pause\" の反対のコマンドは \"lxc start\" です。"
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr "スナップショットからコンテナをリストアします"
-
 #: lxc/restore.go:24
+#, fuzzy
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
@@ -2749,12 +2810,18 @@ msgstr ""
 "\n"
 "--stateful オプションを指定すると、コンテナの実行状態もリストアします。"
 
+#: lxc/restore.go:23
+#, fuzzy
+msgid "Restore instances from snapshots"
+msgstr "スナップショットからコンテナをリストアします"
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr "スナップショットからストレージボリュームをリストアします"
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+#, fuzzy
+msgid "Retrieve the instance's console log"
 msgstr "コンテナのコンソールログを取得します"
 
 #: lxc/init.go:285
@@ -2763,7 +2830,8 @@ msgid "Retrieving image: %s"
 msgstr "イメージの取得中: %s"
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+#, fuzzy
+msgid "Run against all instances"
 msgstr "すべてのコンテナに対してコマンドを実行します"
 
 #: lxc/image.go:1009
@@ -2778,7 +2846,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr "SR-IOV 情報:"
 
@@ -2824,17 +2892,18 @@ msgid "Server version: %s\n"
 msgstr "サーバのバージョン: %s\n"
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+#, fuzzy
+msgid "Set instance device configuration keys"
 msgstr "コンテナデバイスの設定項目を設定します"
 
 #: lxc/config_device.go:507
 #, fuzzy
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 "コンテナのデバイス設定を行います\n"
 "\n"
@@ -2845,7 +2914,7 @@ msgstr ""
 #: lxc/config_device.go:513
 #, fuzzy
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2858,16 +2927,18 @@ msgstr ""
 "<value>"
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+#, fuzzy
+msgid "Set instance or server configuration keys"
 msgstr "コンテナもしくはサーバの設定項目を設定します"
 
 #: lxc/config.go:454
+#, fuzzy
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 "コンテナもしくはサーバの設定を行います\n"
 "\n"
@@ -2983,20 +3054,9 @@ msgstr "デバッグメッセージをすべて表示します"
 msgid "Show all information messages"
 msgstr "詳細な情報を出力します"
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr "コンテナのメタデータファイルを表示します"
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr "コンテナもしくはサーバの設定を表示します"
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr "コンテナもしくはサーバの情報を表示します"
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+#, fuzzy
+msgid "Show content of instance file templates"
 msgstr "コンテナのファイルテンプレートの内容を表示します"
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -3008,13 +3068,29 @@ msgid "Show details on a background operation"
 msgstr "バックグラウンド操作の詳細を表示します"
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+#, fuzzy
+msgid "Show full device configuration for instances or profiles"
 msgstr "コンテナもしくはプロファイルのデバイス設定をすべて表示します"
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr "イメージのプロパティを表示します"
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#, fuzzy
+msgid "Show instance metadata files"
+msgstr "コンテナのメタデータファイルを表示します"
+
+#: lxc/config.go:579 lxc/config.go:580
+#, fuzzy
+msgid "Show instance or server configurations"
+msgstr "コンテナもしくはサーバの設定を表示します"
+
+#: lxc/info.go:32 lxc/info.go:33
+#, fuzzy
+msgid "Show instance or server information"
+msgstr "コンテナもしくはサーバの情報を表示します"
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr "全てのコマンドを表示します (主なコマンドだけではなく)"
@@ -3047,10 +3123,6 @@ msgstr "ストレージボリュームの設定を表示します"
 msgid "Show storage volume configurations"
 msgstr "ストレージボリュームの設定を表示する"
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr "コンテナログの最後の 100 行を表示しますか?"
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr "デフォルトのリモートを表示します"
@@ -3060,6 +3132,11 @@ msgid "Show the expanded configuration"
 msgstr "拡張した設定を表示する"
 
 #: lxc/info.go:43
+#, fuzzy
+msgid "Show the instance's last 100 log lines?"
+msgstr "コンテナログの最後の 100 行を表示しますか?"
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr "サーバで使用可能なリソースを表示します"
 
@@ -3084,7 +3161,7 @@ msgstr "ストレージプールの情報を表示します"
 msgid "Size: %.2fMB"
 msgstr "サイズ: %.2fMB"
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr "サイズ: %s"
@@ -3093,18 +3170,18 @@ msgstr "サイズ: %s"
 msgid "Snapshot storage volumes"
 msgstr "ストレージボリュームのスナップショットを取得します"
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr "スナップショット:"
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr "ソケット %d:"
 
 #: lxc/action.go:269
-#, c-format
-msgid "Some containers failed to %s"
+#, fuzzy, c-format
+msgid "Some instances failed to %s"
 msgstr "一部のコンテナで %s が失敗しました"
 
 #: lxc/image.go:936
@@ -3112,7 +3189,8 @@ msgid "Source:"
 msgstr "取得元:"
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+#, fuzzy
+msgid "Start instances"
 msgstr "コンテナを起動します"
 
 #: lxc/launch.go:68
@@ -3125,26 +3203,29 @@ msgstr "%s を起動中"
 msgid "State: %s"
 msgstr "状態: %s"
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr "状態: %s"
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+#, fuzzy
+msgid "Stop instances"
 msgstr "コンテナを停止します"
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+#, fuzzy
+msgid "Stop the instance if currently running"
 msgstr "実行中の場合、コンテナを停止します"
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+#, fuzzy
+msgid "Stopping instance failed!"
 msgstr "コンテナの停止に失敗しました!"
 
 #: lxc/delete.go:120
-#, c-format
-msgid "Stopping the container failed: %s"
+#, fuzzy, c-format
+msgid "Stopping the instance failed: %s"
 msgstr "コンテナの停止に失敗しました: %s"
 
 #: lxc/storage.go:145
@@ -3185,24 +3266,25 @@ msgid "Storage volume moved successfully!"
 msgstr "ストレージボリュームの移動が成功しました!"
 
 #: lxc/action.go:114
-msgid "Store the container state"
+#, fuzzy
+msgid "Store the instance state"
 msgstr "コンテナの状態を保存します"
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr "サポートするモード: %s"
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr "サポートするポート: %s"
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr "Swap (現在値)"
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr "Swap (ピーク)"
 
@@ -3223,11 +3305,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr "--container-only と --target は同時に指定できません"
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 #, fuzzy
 msgid "The --instance-only flag can't be used with --target"
 msgstr "--container-only と --target は同時に指定できません"
@@ -3240,31 +3318,34 @@ msgstr "--mode と --target は同時に指定できません"
 msgid "The --stateless flag can't be used with --target"
 msgstr "--stateless と --target は同時に指定できません"
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr "デバイスはすでに存在します"
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr "デバイスが存在しません"
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+#, fuzzy
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr "コンテナは実行中です。先に停止させるか、--force を指定してください"
 
 #: lxc/publish.go:110
+#, fuzzy
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 "コンテナは現在実行中です。停止して、再起動するために --force を使用してくださ"
 "い"
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
+#, fuzzy
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr "起動しようとしたコンテナに接続されているネットワークがありません。"
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr "デバイスはすでに存在します"
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
-msgstr "デバイスが存在しません"
-
 #: lxc/init.go:372
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
@@ -3283,7 +3364,8 @@ msgid "The profile device doesn't exist"
 msgstr "プロファイルのデバイスが存在しません"
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+#, fuzzy
+msgid "The source LXD server is not clustered"
 msgstr "移動元の LXD インスタンスはクラスタに属していません"
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3302,9 +3384,10 @@ msgstr ""
 "さい。"
 
 #: lxc/main.go:242
+#, fuzzy
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3322,12 +3405,13 @@ msgstr ""
 "仮想マシン上にローカルな LXD サーバを簡単にセットアップするには、https://"
 "multipass.run の使用を検討してください。"
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr "スレッド:"
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+#, fuzzy
+msgid "Time to wait for the instance before killing it"
 msgstr "コンテナを強制停止するまでの時間"
 
 #: lxc/image.go:897
@@ -3335,7 +3419,8 @@ msgid "Timestamps:"
 msgstr "タイムスタンプ:"
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+#, fuzzy
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 "コンテナにネットワークを接続するには、lxc network attach を使用してください"
 
@@ -3349,24 +3434,25 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr "コンソールから切り離すには <ctrl>+a q を押します"
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+#, fuzzy
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 "初めてコンテナを起動するには、\"lxc launch ubuntu:18.04\" と実行してみてくだ"
 "さい"
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 "--target オプションは、コピー先のリモートサーバがクラスタに属していなければな"
 "りません"
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr "合計: %v"
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr "トランシーバータイプ: %s"
@@ -3383,27 +3469,27 @@ msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpu
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpull)。"
 
-#: lxc/copy.go:354
-#, c-format
-msgid "Transferring container: %s"
-msgstr "コンテナを転送中: %s"
-
 #: lxc/image.go:725
 #, c-format
 msgid "Transferring image: %s"
 msgstr "イメージを転送中: %s"
 
+#: lxc/copy.go:354
+#, fuzzy, c-format
+msgid "Transferring instance: %s"
+msgstr "コンテナを転送中: %s"
+
 #: lxc/action.go:196 lxc/launch.go:99
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr "更に情報を得るために `lxc info --show-log %s` を実行してみてください"
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr "タイプ: %s"
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, fuzzy, c-format
 msgid "Type: %s (ephemeral)"
 msgstr "タイプ: ephemeral"
@@ -3421,7 +3507,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3442,15 +3528,18 @@ msgid "Unknown file type '%s'"
 msgstr "未知のファイルタイプ '%s'"
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+#, fuzzy
+msgid "Unset all profiles on the target instance"
 msgstr "移動先のコンテナのすべてのプロファイルを削除します"
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+#, fuzzy
+msgid "Unset instance device configuration keys"
 msgstr "コンテナデバイスの設定を削除します"
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+#, fuzzy
+msgid "Unset instance or server configuration keys"
 msgstr "コンテナもしくはサーバの設定を削除します"
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3473,6 +3562,11 @@ msgstr "ストレージプールの設定を削除します"
 msgid "Unset storage volume configuration keys"
 msgstr "ストレージボリュームの設定を削除します"
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3485,7 +3579,7 @@ msgstr ""
 "最適化された形でストレージドライバを使います (同様のプール上にのみリストアで"
 "きます)"
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr "使用済: %v"
@@ -3505,27 +3599,27 @@ msgstr ""
 "ユーザからのシグナルを 3 度受信したので exit しました。リモート操作は実行し続"
 "けます"
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr "ベンダー: %v"
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr "ベンダ: %v (%v)"
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr "Verb: %s (%s)"
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr "WWN: %s"
@@ -3547,14 +3641,16 @@ msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "スナップショットを含めずにコンテナのみをバックアップするかどうか"
 
 #: lxc/restore.go:36
+#, fuzzy
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 "スナップショットからコンテナの稼動状態をリストアするかどうか (取得可能な場合)"
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+#, fuzzy
+msgid "Whether or not to snapshot the instance's running state"
 msgstr "コンテナの稼動状態のスナップショットを取得するかどうか"
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3571,11 +3667,13 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr "--mode と同時に -t または -T は指定できません"
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+#, fuzzy
+msgid "You must specify a destination instance name when using --target"
 msgstr "--target オプションを使うときはコピー先のコンテナ名を指定してください"
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+#, fuzzy
+msgid "You must specify a source instance name"
 msgstr "コピー元のコンテナ名を指定してください"
 
 #: lxc/alias.go:52
@@ -3587,12 +3685,14 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
-msgstr ""
+#, fuzzy
+msgid "add [<remote>:]<instance> <profile>"
+msgstr "restore [<remote>:]<container> <snapshot>"
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
-msgstr ""
+#, fuzzy
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgstr "set [<remote>:]<container|profile> <device> <key>=<value>..."
 
 #: lxc/remote.go:83
 msgid "add [<remote>] <IP|FQDN|URL>"
@@ -3603,17 +3703,19 @@ msgid "alias"
 msgstr "alias"
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
-msgstr ""
+#, fuzzy
+msgid "assign [<remote>:]<instance> <profiles>"
+msgstr "switch [<remote>:] <project>"
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
-msgstr ""
+#, fuzzy
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
+msgstr "set [<remote>:]<pool> <volume> <key>=<value>..."
 
 #: lxc/storage_volume.go:216
 msgid ""
@@ -3635,8 +3737,9 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
-msgstr ""
+#, fuzzy
+msgid "console [<remote>:]<instance>"
+msgstr "restore [<remote>:]<container> <snapshot>"
 
 #: lxc/storage_volume.go:298
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
@@ -3659,8 +3762,9 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "create [<remote>:]<instance> <template>"
+msgstr "restore [<remote>:]<container> <snapshot>"
 
 #: lxc/network.go:252
 msgid "create [<remote>:]<network> [key=value...]"
@@ -3694,27 +3798,30 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr "delete [<remote>:]<image> [[<remote>:]<image>...]"
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "delete [<remote>:]<instance> <template>"
+msgstr "delete [<remote>:]<image> [[<remote>:]<image>...]"
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+#, fuzzy
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 
 #: lxc/delete.go:27
+#, fuzzy
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 "delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
 "<snapshot>]...]"
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr "delete [<remote>:]<image> [[<remote>:]<image>...]"
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3744,20 +3851,23 @@ msgid "description"
 msgstr "説明"
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
-msgstr ""
+#, fuzzy
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
+msgstr "set [<remote>:]<network> <key>=<value>..."
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
-msgstr ""
+#, fuzzy
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
+msgstr "set [<remote>:]<pool> <volume> <key>=<value>..."
 
 #: lxc/storage_volume.go:695
 msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
-msgstr ""
+#, fuzzy
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
+msgstr "set [<remote>:]<network> <key>=<value>..."
 
 #: lxc/config_device.go:22
 msgid "device"
@@ -3771,21 +3881,24 @@ msgstr "無効"
 msgid "driver"
 msgstr "ドライバ"
 
-#: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
 msgstr ""
 
+#: lxc/config_metadata.go:51
+#, fuzzy
+msgid "edit [<remote>:]<instance>"
+msgstr "edit [<remote>:][<container>[/<snapshot>]]"
+
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "edit [<remote>:]<instance> <template>"
+msgstr "edit [<remote>:][<container>[/<snapshot>]]"
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
-msgstr ""
+#, fuzzy
+msgid "edit [<remote>:]<instance>/<path>"
+msgstr "edit [<remote>:][<container>[/<snapshot>]]"
 
 #: lxc/network.go:544
 msgid "edit [<remote>:]<network>"
@@ -3808,7 +3921,8 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+#, fuzzy
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "edit [<remote>:][<container>[/<snapshot>]]"
 
 #: lxc/cluster.go:329
@@ -3825,33 +3939,34 @@ msgid "error: %v"
 msgstr "エラー: %v"
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr "%s に失効"
 
+#: lxc/image.go:444
+msgid "export [<remote>:]<image> [<target>]"
+msgstr ""
+
 #: lxc/export.go:31
+#, fuzzy
 msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 "export [<remote>:]<container> [target] [--container-only] [--optimized-"
 "storage]"
 
-#: lxc/image.go:444
-msgid "export [<remote>:]<image> [<target>]"
-msgstr ""
-
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
-msgstr ""
+#, fuzzy
+msgid "get [<remote>:]<instance|profile> <device> <key>"
+msgstr "set [<remote>:]<container|profile> <device> <key>=<value>..."
 
 #: lxc/network.go:667
 msgid "get [<remote>:]<network> <key>"
@@ -3874,8 +3989,9 @@ msgid "get [<remote>:]<project> <key>"
 msgstr "get [<remote>:]<project> <key>"
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
-msgstr ""
+#, fuzzy
+msgid "get [<remote>:][<instance>] <key>"
+msgstr "get [<remote>:]<project> <key>"
 
 #: lxc/remote.go:417
 msgid "get-default"
@@ -3911,9 +4027,10 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
-msgstr ""
+#: lxc/info.go:31
+#, fuzzy
+msgid "info [<remote>:][<instance>]"
+msgstr "edit [<remote>:][<container>[/<snapshot>]]"
 
 #: lxc/init.go:38
 msgid "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
@@ -3941,12 +4058,14 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
-msgstr ""
+#, fuzzy
+msgid "list [<remote>:]<instance>"
+msgstr "delete [<remote>:]<project>"
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
-msgstr ""
+#, fuzzy
+msgid "list [<remote>:]<instance|profile>"
+msgstr "delete [<remote>:]<project>"
 
 #: lxc/storage_volume.go:1066
 msgid "list [<remote>:]<pool>"
@@ -3981,27 +4100,30 @@ msgstr ""
 "    エイリアス名 \"list\" を \"my-list\" に変更します。"
 
 #: lxc/config_device.go:79
+#, fuzzy
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
 "c1 path=opt\n"
 "    ホストの /share/c1 をコンテナ内の /opt にマウントします。"
 
 #: lxc/config.go:92
+#, fuzzy
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 "lxc config edit <container> < container.yaml\n"
 "    コンテナの設定を config.yaml を使って更新します。"
 
 #: lxc/config.go:459
+#, fuzzy
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -4019,17 +4141,19 @@ msgstr ""
 "    サーバの認証パスワードを blah に設定します。"
 
 #: lxc/export.go:35
+#, fuzzy
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    Download a backup tarball of the u1 instance."
 msgstr ""
 "lxc export u1 backup0.tar.gz\n"
 "    u1 コンテナのバックアップ tarball をダウンロードします。"
 
 #: lxc/file.go:219
+#, fuzzy
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
-"   To pull /etc/hosts from the container and write it to the current "
+"   To pull /etc/hosts from the instance and write it to the current "
 "directory."
 msgstr ""
 "lxc file pull foo/etc/hosts .\n"
@@ -4037,9 +4161,10 @@ msgstr ""
 "す。"
 
 #: lxc/file.go:409
+#, fuzzy
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
-"   To push /etc/hosts into the container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   /etc/hosts ファイルを、コンテナ \"foo\" 内 (の /etc/hosts) にコピーしま"
@@ -4060,17 +4185,19 @@ msgstr ""
 "    YAML ファイルからイメージプロパティをロードします"
 
 #: lxc/import.go:30
+#, fuzzy
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 "lxc import backup0.tar.gz\n"
 "    backup0.tar.gz を使って新しいコンテナを作成します。"
 
-#: lxc/info.go:34
+#: lxc/info.go:35
+#, fuzzy
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -4082,11 +4209,12 @@ msgstr ""
 "    LXD サーバの情報を表示します。"
 
 #: lxc/init.go:41
+#, fuzzy
 msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
@@ -4094,11 +4222,12 @@ msgstr ""
 "    config.yaml の設定を使ってコンテナを作成します"
 
 #: lxc/launch.go:25
+#, fuzzy
 msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
@@ -4110,10 +4239,10 @@ msgstr ""
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -4149,16 +4278,17 @@ msgstr ""
 "    lifecycle イベントのみを表示します。"
 
 #: lxc/move.go:39
+#, fuzzy
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
@@ -4206,7 +4336,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4229,9 +4359,10 @@ msgstr ""
 "    profile.yaml の内容でプロファイルを更新します"
 
 #: lxc/query.go:33
+#, fuzzy
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    ローカルのコンテナ \"c1\" を削除します。"
@@ -4309,9 +4440,9 @@ msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
 #: lxc/move.go:34
+#, fuzzy
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
@@ -4337,11 +4468,13 @@ msgid "operation"
 msgstr "operation"
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
-msgstr ""
+#, fuzzy
+msgid "override [<remote>:]<instance> <device> [key=value...]"
+msgstr "set [<remote>:]<container|profile> <device> <key>=<value>..."
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+#, fuzzy
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr "pause [<remote>:]<container> [[<remote>:]<container>...]"
 
 #: lxc/config.go:54
@@ -4357,24 +4490,26 @@ msgid "project"
 msgstr ""
 
 #: lxc/publish.go:33
+#, fuzzy
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 "publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
 "[key=value...]"
 
 #: lxc/file.go:215
+#, fuzzy
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 
 #: lxc/file.go:405
+#, fuzzy
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
@@ -4405,12 +4540,14 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
-msgstr ""
+#, fuzzy
+msgid "remove [<remote>:]<instance> <profile>"
+msgstr "restore [<remote>:]<container> <snapshot>"
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
-msgstr ""
+#, fuzzy
+msgid "remove [<remote>:]<instance|profile> <name>..."
+msgstr "set [<remote>:]<profile> <key><value>..."
 
 #: lxc/cluster.go:243
 msgid "remove [<remote>:]<member>"
@@ -4429,7 +4566,8 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+#, fuzzy
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 
 #: lxc/cluster.go:193
@@ -4457,11 +4595,13 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr "rename [<remote>:]<project> <new-name>"
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+#, fuzzy
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr "restart [<remote>:]<container> [[<remote>:]<container>...]"
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+#, fuzzy
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr "restore [<remote>:]<container> <snapshot>"
 
 #: lxc/storage_volume.go:1561
@@ -4469,7 +4609,8 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr "restore [<remote>:]<pool> <volume> <snapshot>"
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+#, fuzzy
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr "set [<remote>:]<container|profile> <device> <key>=<value>..."
 
 #: lxc/network.go:1009
@@ -4493,28 +4634,32 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr "set [<remote>:]<project> <key>=<value>..."
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+#, fuzzy
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr "set [<remote>:][<container>] <key>=<value>..."
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
 msgstr ""
 
+#: lxc/config_metadata.go:173
+#, fuzzy
+msgid "show [<remote>:]<instance>"
+msgstr "show [<remote>:][<container>[/<snapshot>]]"
+
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
-msgstr ""
+#, fuzzy
+msgid "show [<remote>:]<instance> <template>"
+msgstr "show [<remote>:][<container>[/<snapshot>]]"
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
-msgstr ""
+#, fuzzy
+msgid "show [<remote>:]<instance|profile>"
+msgstr "show [<remote>:][<container>[/<snapshot>]]"
 
 #: lxc/cluster.go:144
 msgid "show [<remote>:]<member>"
@@ -4545,12 +4690,14 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+#, fuzzy
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr "show [<remote>:][<container>[/<snapshot>]]"
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
-msgstr ""
+#, fuzzy
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
+msgstr "show [<remote>:][<container>[/<snapshot>]]"
 
 #: lxc/storage_volume.go:1490
 msgid "snapshot [<remote>:]<pool> <volume> [<snapshot>]"
@@ -4561,19 +4708,21 @@ msgid "space used"
 msgstr "使用量"
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+#, fuzzy
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr "start [<remote>:]<container> [[<remote>:]<container>...]"
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr "ステートフル"
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr "ステートレス"
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+#, fuzzy
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr "stop [<remote>:]<container> [[<remote>:]<container>...]"
 
 #: lxc/storage.go:31
@@ -4588,7 +4737,7 @@ msgstr "switch <remote>"
 msgid "switch [<remote>:] <project>"
 msgstr "switch [<remote>:] <project>"
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr "%s に取得しました"
@@ -4610,8 +4759,9 @@ msgid "unreachable"
 msgstr "サーバに接続できません"
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
-msgstr ""
+#, fuzzy
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
+msgstr "set [<remote>:]<container|profile> <device> <key>=<value>..."
 
 #: lxc/network.go:1141
 msgid "unset [<remote>:]<network> <key>"
@@ -4634,8 +4784,9 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr "unset [<remote>:]<project> <key>"
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
-msgstr ""
+#, fuzzy
+msgid "unset [<remote>:][<instance>] <key>"
+msgstr "unset [<remote>:]<project> <key>"
 
 #: lxc/storage.go:442
 msgid "used by"
@@ -4658,6 +4809,15 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
+#~ msgid "--target cannot be used with containers"
+#~ msgstr "--target はコンテナでは使えません"
+
+#~ msgid "Missing container.name name"
+#~ msgstr "コンテナ名を指定する必要があります"
+
+#~ msgid "The --container-only flag can't be used with --target"
+#~ msgstr "--container-only と --target は同時に指定できません"
+
 #~ msgid "Container name is: %s"
 #~ msgstr "コンテナ名: %s"
 
diff --git a/po/ko.po b/po/ko.po
index 21282ec057..720050fbc8 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/lxd.pot b/po/lxd.pot
index f3da0a6e35..027ec31264 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: 2019-12-06 22:53-0500\n"
+        "POT-Creation-Date: 2020-01-13 15:14-0500\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"
@@ -50,7 +50,7 @@ msgid   "### This is a yaml representation of the configuration.\n"
         "### Any line starting with a '# will be ignored.\n"
         "###\n"
         "### A sample configuration looks like:\n"
-        "### name: container1\n"
+        "### name: instance1\n"
         "### profiles:\n"
         "### - default\n"
         "### config:\n"
@@ -65,8 +65,17 @@ msgid   "### This is a yaml representation of the configuration.\n"
         "### Note that the name is shown but cannot be changed"
 msgstr  ""
 
+#: lxc/image.go:336
+msgid   "### This is a yaml representation of the image properties.\n"
+        "### Any line starting with a '# will be ignored.\n"
+        "###\n"
+        "### Each property is represented by a single line:\n"
+        "### An example would be:\n"
+        "###  description: My custom image"
+msgstr  ""
+
 #: lxc/config_metadata.go:62
-msgid   "### This is a yaml representation of the container metadata.\n"
+msgid   "### This is a yaml representation of the instance metadata.\n"
         "### Any line starting with a '# will be ignored.\n"
         "###\n"
         "### A sample configuration looks like:\n"
@@ -88,15 +97,6 @@ msgid   "### This is a yaml representation of the container metadata.\n"
         "###     properties: {}"
 msgstr  ""
 
-#: lxc/image.go:336
-msgid   "### This is a yaml representation of the image properties.\n"
-        "### Any line starting with a '# will be ignored.\n"
-        "###\n"
-        "### Each property is represented by a single line:\n"
-        "### An example would be:\n"
-        "###  description: My custom image"
-msgstr  ""
-
 #: lxc/network.go:555
 msgid   "### This is a yaml representation of the network.\n"
         "### Any line starting with a '# will be ignored.\n"
@@ -152,7 +152,7 @@ msgid   "### This is a yaml representation of the project.\n"
         "### Note that the name is shown but cannot be changed"
 msgstr  ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid   "%d (id: %d, online: %v)"
 msgstr  ""
@@ -181,38 +181,34 @@ msgstr  ""
 msgid   "(none)"
 msgstr  ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid   "- Level %d (type: %s): %s"
 msgstr  ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid   "- Partition %d"
 msgstr  ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid   "- Port %d (%s)"
 msgstr  ""
 
-#: lxc/copy.go:153
-msgid   "--container-only can't be passed when the source is a snapshot"
-msgstr  ""
-
 #: lxc/init.go:122
 msgid   "--empty cannot be combined with an image name"
 msgstr  ""
 
-#: lxc/copy.go:164
-msgid   "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid   "--instance-only can't be passed when the source is a snapshot"
 msgstr  ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid   "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid   "--refresh can only be used with instances"
 msgstr  ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637 lxc/info.go:424
 msgid   "--target cannot be used with instances"
 msgstr  ""
 
@@ -241,7 +237,7 @@ msgid   "Action (defaults to GET)"
 msgstr  ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid   "Add devices to containers or profiles"
+msgid   "Add devices to instances or profiles"
 msgstr  ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -266,10 +262,10 @@ msgid   "Add new trusted clients"
 msgstr  ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid   "Add profiles to containers"
+msgid   "Add profiles to instances"
 msgstr  ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid   "Address: %s"
 msgstr  ""
@@ -297,22 +293,22 @@ msgstr  ""
 msgid   "Aliases:"
 msgstr  ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid   "Architecture: %s"
 msgstr  ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid   "Architecture: %v"
 msgstr  ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid   "Assign sets of profiles to containers"
+msgid   "Assign sets of profiles to instances"
 msgstr  ""
 
 #: lxc/network.go:107
-msgid   "Attach network interfaces to containers"
+msgid   "Attach network interfaces to instances"
 msgstr  ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -320,11 +316,11 @@ msgid   "Attach network interfaces to profiles"
 msgstr  ""
 
 #: lxc/network.go:108
-msgid   "Attach new network interfaces to containers"
+msgid   "Attach new network interfaces to instances"
 msgstr  ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid   "Attach new storage volumes to containers"
+msgid   "Attach new storage volumes to instances"
 msgstr  ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -332,13 +328,13 @@ msgid   "Attach new storage volumes to profiles"
 msgstr  ""
 
 #: lxc/console.go:31
-msgid   "Attach to container consoles"
+msgid   "Attach to instance consoles"
 msgstr  ""
 
 #: lxc/console.go:32
-msgid   "Attach to container consoles\n"
+msgid   "Attach to instance consoles\n"
         "\n"
-        "This command allows you to interact with the boot console of a container\n"
+        "This command allows you to interact with the boot console of a instance\n"
         "as well as retrieve past log entries from it."
 msgstr  ""
 
@@ -347,7 +343,7 @@ msgstr  ""
 msgid   "Authentication type '%s' not supported by server"
 msgstr  ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid   "Auto negotiation: %v"
 msgstr  ""
@@ -386,19 +382,19 @@ msgid   "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr  ""
 
 #: lxc/action.go:239
-msgid   "Both --all and container name given"
+msgid   "Both --all and instance name given"
 msgstr  ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid   "Brand: %v"
 msgstr  ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid   "Bytes received"
 msgstr  ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid   "Bytes sent"
 msgstr  ""
 
@@ -410,20 +406,20 @@ msgstr  ""
 msgid   "COMMON NAME"
 msgstr  ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid   "CPU (%s):"
 msgstr  ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid   "CPU usage (in seconds)"
 msgstr  ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid   "CPU usage:"
 msgstr  ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid   "CPUs (%s):"
 msgstr  ""
@@ -436,7 +432,7 @@ msgstr  ""
 msgid   "CREATED AT"
 msgstr  ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid   "CUDA Version: %v"
 msgstr  ""
@@ -446,7 +442,7 @@ msgstr  ""
 msgid   "Cached: %s"
 msgstr  ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid   "Caches:"
 msgstr  ""
 
@@ -496,12 +492,12 @@ msgstr  ""
 msgid   "Candid domain to use"
 msgstr  ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid   "Card %d:"
 msgstr  ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid   "Card: %s (%s)"
 msgstr  ""
@@ -520,7 +516,7 @@ msgstr  ""
 msgid   "Client version: %s\n"
 msgstr  ""
 
-#: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584 lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54 lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730 lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146 lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588 lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:305 lxc/storage_volume.go:465 lxc/storage_volume.go:542 lxc/storage_volume.go:784 lxc/storage_volume.go:981 lxc/storage_volume.go:1146 lxc/storage_volume.go:1176 lxc/storage_volume.go:1292 lxc/storage_volume.go:1371 lxc/storage_volume.go:1464
+#: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584 lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54 lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730 lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146 lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588 lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:305 lxc/storage_volume.go:465 lxc/storage_volume.go:542 lxc/storage_volume.go:784 lxc/storage_volume.go:981 lxc/storage_volume.go:1146 lxc/storage_volume.go:1176 lxc/storage_volume.go:1292 lxc/storage_volume.go:1371 lxc/storage_volume.go:1464
 msgid   "Cluster member name"
 msgstr  ""
 
@@ -544,7 +540,7 @@ msgid   "Command line client for LXD\n"
 msgstr  ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid   "Config key/value to apply to the new container"
+msgid   "Config key/value to apply to the new instance"
 msgstr  ""
 
 #: lxc/project.go:88
@@ -552,7 +548,7 @@ msgid   "Config key/value to apply to the new project"
 msgstr  ""
 
 #: lxc/move.go:50
-msgid   "Config key/value to apply to the target container"
+msgid   "Config key/value to apply to the target instance"
 msgstr  ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
@@ -564,32 +560,19 @@ msgstr  ""
 msgid   "Console log:"
 msgstr  ""
 
-#: lxc/publish.go:80
-msgid   "Container name is mandatory"
-msgstr  ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid   "Container published with fingerprint: %s"
-msgstr  ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid   "Control: %s (%s)"
 msgstr  ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid   "Copy a stateful container stateless"
+msgid   "Copy a stateful instance stateless"
 msgstr  ""
 
 #: lxc/image.go:135
 msgid   "Copy aliases from source"
 msgstr  ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid   "Copy containers within or in between LXD instances"
-msgstr  ""
-
 #: lxc/image.go:127
 msgid   "Copy images between servers"
 msgstr  ""
@@ -601,6 +584,10 @@ msgid   "Copy images between servers\n"
         "It requires the source to be an alias and for it to be public."
 msgstr  ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid   "Copy instances within or in between LXD servers"
+msgstr  ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid   "Copy profile inherited devices and override configuration keys"
 msgstr  ""
@@ -613,14 +600,14 @@ msgstr  ""
 msgid   "Copy storage volumes"
 msgstr  ""
 
-#: lxc/copy.go:51
-msgid   "Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr  ""
-
 #: lxc/copy.go:50
 msgid   "Copy the instance without its snapshots"
 msgstr  ""
 
+#: lxc/copy.go:51
+msgid   "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr  ""
+
 #: lxc/storage_volume.go:306
 msgid   "Copy the volume without its snapshots"
 msgstr  ""
@@ -643,12 +630,12 @@ msgstr  ""
 msgid   "Copying the storage volume: %s"
 msgstr  ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid   "Core %d"
 msgstr  ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid   "Cores:"
 msgstr  ""
 
@@ -656,16 +643,20 @@ msgstr  ""
 msgid   "Could not create server cert dir"
 msgstr  ""
 
+#: lxc/init.go:57
+msgid   "Create a virtual machine"
+msgstr  ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid   "Create aliases for existing images"
 msgstr  ""
 
 #: lxc/init.go:56
-msgid   "Create an empty container"
+msgid   "Create an empty instance"
 msgstr  ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid   "Create and start containers from images"
+msgid   "Create and start instances from images"
 msgstr  ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -673,28 +664,28 @@ msgid   "Create any directories necessary"
 msgstr  ""
 
 #: lxc/snapshot.go:23
-msgid   "Create container snapshots"
+msgid   "Create instance snapshots"
 msgstr  ""
 
 #: lxc/snapshot.go:24
-msgid   "Create container snapshots\n"
+msgid   "Create instance snapshots\n"
         "\n"
-        "When --stateful is used, LXD attempts to checkpoint the container's\n"
+        "When --stateful is used, LXD attempts to checkpoint the instance's\n"
         "running state, including process memory state, TCP connections, ..."
 msgstr  ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid   "Create containers from images"
-msgstr  ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid   "Create new container file templates"
+msgid   "Create instances from images"
 msgstr  ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid   "Create new custom storage volumes"
 msgstr  ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid   "Create new instance file templates"
+msgstr  ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid   "Create new networks"
 msgstr  ""
@@ -712,14 +703,10 @@ msgid   "Create storage pools"
 msgstr  ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid   "Create the container with no profiles applied"
+msgid   "Create the instance with no profiles applied"
 msgstr  ""
 
-#: lxc/init.go:57
-msgid   "Create virtual machine"
-msgstr  ""
-
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid   "Created: %s"
 msgstr  ""
@@ -733,7 +720,7 @@ msgstr  ""
 msgid   "Creating the instance"
 msgstr  ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid   "Current number of VFs: %d"
 msgstr  ""
@@ -750,7 +737,7 @@ msgstr  ""
 msgid   "DRIVER"
 msgstr  ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid   "DRM:"
 msgstr  ""
 
@@ -766,16 +753,8 @@ msgstr  ""
 msgid   "Delete a background operation (will attempt to cancel)"
 msgstr  ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid   "Delete container file templates"
-msgstr  ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid   "Delete containers and snapshots"
-msgstr  ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid   "Delete files in containers"
+msgid   "Delete files in instances"
 msgstr  ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -786,6 +765,14 @@ msgstr  ""
 msgid   "Delete images"
 msgstr  ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid   "Delete instance file templates"
+msgstr  ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid   "Delete instances and snapshots"
+msgstr  ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid   "Delete networks"
 msgstr  ""
@@ -806,12 +793,12 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146 lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1286 lxc/storage_volume.go:1362 lxc/storage_volume.go:1461 lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146 lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1286 lxc/storage_volume.go:1362 lxc/storage_volume.go:1461 lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid   "Detach network interfaces from containers"
+msgid   "Detach network interfaces from instances"
 msgstr  ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -819,7 +806,7 @@ msgid   "Detach network interfaces from profiles"
 msgstr  ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid   "Detach storage volumes from containers"
+msgid   "Detach storage volumes from instances"
 msgstr  ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -846,7 +833,7 @@ msgstr  ""
 msgid   "Device already exists: %s"
 msgstr  ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid   "Device: %s"
 msgstr  ""
@@ -871,20 +858,20 @@ msgstr  ""
 msgid   "Disable stdin (reads from /dev/null)"
 msgstr  ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid   "Disk %d:"
 msgstr  ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid   "Disk usage:"
 msgstr  ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid   "Disk:"
 msgstr  ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid   "Disks:"
 msgstr  ""
 
@@ -896,7 +883,7 @@ msgstr  ""
 msgid   "Don't show progress information"
 msgstr  ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid   "Driver: %v (%v)"
 msgstr  ""
@@ -913,24 +900,24 @@ msgstr  ""
 msgid   "Early server side processing of file tranfer requests cannot be canceled (interrupt two more times to force)"
 msgstr  ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid   "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid   "Edit files in instances"
 msgstr  ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid   "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid   "Edit image properties"
 msgstr  ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid   "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid   "Edit instance file templates"
 msgstr  ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid   "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid   "Edit instance metadata files"
 msgstr  ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid   "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid   "Edit instance or server configurations as YAML"
 msgstr  ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -959,13 +946,13 @@ msgid   "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr  ""
 
 #: lxc/cluster.go:330
-msgid   "Enable clustering on a single non-clustered LXD instance"
+msgid   "Enable clustering on a single non-clustered LXD server"
 msgstr  ""
 
 #: lxc/cluster.go:331
-msgid   "Enable clustering on a single non-clustered LXD instance\n"
+msgid   "Enable clustering on a single non-clustered LXD server\n"
         "\n"
-        "  This command turns a non-clustered LXD instance into the first member of a new\n"
+        "  This command turns a non-clustered LXD server into the first member of a new\n"
         "  LXD cluster, which will have the given name.\n"
         "\n"
         "  It's required that the LXD is already available on the network. You can check\n"
@@ -978,7 +965,7 @@ msgid   "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr  ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid   "Ephemeral container"
+msgid   "Ephemeral instance"
 msgstr  ""
 
 #: lxc/config_template.go:203
@@ -991,18 +978,18 @@ msgid   "Event type to listen for"
 msgstr  ""
 
 #: lxc/exec.go:40
-msgid   "Execute commands in containers"
+msgid   "Execute commands in instances"
 msgstr  ""
 
 #: lxc/exec.go:41
-msgid   "Execute commands in containers\n"
+msgid   "Execute commands in instances\n"
         "\n"
         "The command is executed directly using exec, so there is no shell and\n"
         "shell patterns (variables, file redirects, ...) won't be understood.\n"
         "If you need a shell environment you need to execute the shell\n"
         "executable, passing the shell commands as arguments, for example:\n"
         "\n"
-        "  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+        "  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
         "\n"
         "Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored)."
 msgstr  ""
@@ -1027,11 +1014,11 @@ msgid   "Export and download images\n"
 msgstr  ""
 
 #: lxc/export.go:32
-msgid   "Export container backups"
+msgid   "Export instance backups"
 msgstr  ""
 
 #: lxc/export.go:33
-msgid   "Export containers as backup tarballs."
+msgid   "Export instances as backup tarballs."
 msgstr  ""
 
 #: lxc/export.go:120
@@ -1097,11 +1084,11 @@ msgid   "Force removing a member, even if degraded"
 msgstr  ""
 
 #: lxc/action.go:120
-msgid   "Force the container to shutdown"
+msgid   "Force the instance to shutdown"
 msgstr  ""
 
 #: lxc/delete.go:34
-msgid   "Force the removal of running containers"
+msgid   "Force the removal of running instances"
 msgstr  ""
 
 #: lxc/main.go:62
@@ -1114,11 +1101,11 @@ msgid   "Forcefully removing a server from the cluster should only be done as a
         "resort.\n"
         "\n"
         "The removed server will not be functional after this action and will require a\n"
-        "full reset of LXD, losing any remaining container, image or storage volume\n"
+        "full reset of LXD, losing any remaining instance, image or storage volume\n"
         "that the server may have held.\n"
         "\n"
         "When possible, a graceful removal should be preferred, this will require you to\n"
-        "move any affected container, image or storage volume to another server prior to\n"
+        "move any affected instance, image or storage volume to another server prior to\n"
         "the server being cleanly removed from the cluster.\n"
         "\n"
         "The --force flag should only be used if the server has died, been reinstalled\n"
@@ -1131,26 +1118,26 @@ msgstr  ""
 msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid   "Free: %v"
 msgstr  ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid   "Frequency: %vMhz"
 msgstr  ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid   "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr  ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid   "GPU:"
 msgstr  ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid   "GPUs:"
 msgstr  ""
 
@@ -1167,11 +1154,11 @@ msgid   "Get runtime information on networks"
 msgstr  ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid   "Get values for container device configuration keys"
+msgid   "Get values for instance device configuration keys"
 msgstr  ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid   "Get values for container or server configuration keys"
+msgid   "Get values for instance or server configuration keys"
 msgstr  ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1202,7 +1189,7 @@ msgstr  ""
 msgid   "HOSTNAME"
 msgstr  ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid   "Hugepages:\n"
 msgstr  ""
 
@@ -1210,12 +1197,12 @@ msgstr  ""
 msgid   "ID"
 msgstr  ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid   "ID: %d"
 msgstr  ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid   "ID: %s"
 msgstr  ""
@@ -1245,11 +1232,11 @@ msgid   "If this is your first time running LXD on this machine, you should also
 msgstr  ""
 
 #: lxc/snapshot.go:35
-msgid   "Ignore any configured auto-expiry for the container"
+msgid   "Ignore any configured auto-expiry for the instance"
 msgstr  ""
 
 #: lxc/action.go:116
-msgid   "Ignore the container state"
+msgid   "Ignore the instance state"
 msgstr  ""
 
 #: lxc/image.go:1326
@@ -1283,11 +1270,7 @@ msgid   "Image refreshed successfully!"
 msgstr  ""
 
 #: lxc/import.go:28
-msgid   "Import backups of containers including their snapshots."
-msgstr  ""
-
-#: lxc/import.go:27
-msgid   "Import container backups"
+msgid   "Import backups of instances including their snapshots."
 msgstr  ""
 
 #: lxc/image.go:605
@@ -1300,12 +1283,16 @@ msgstr  ""
 msgid   "Import images into the image store"
 msgstr  ""
 
+#: lxc/import.go:27
+msgid   "Import instance backups"
+msgstr  ""
+
 #: lxc/import.go:72
 #, c-format
-msgid   "Importing container: %s"
+msgid   "Importing instance: %s"
 msgstr  ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid   "Infiniband:"
 msgstr  ""
 
@@ -1313,11 +1300,20 @@ msgstr  ""
 msgid   "Input data"
 msgstr  ""
 
+#: lxc/publish.go:80
+msgid   "Instance name is mandatory"
+msgstr  ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid   "Instance name is: %s"
 msgstr  ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid   "Instance published with fingerprint: %s"
+msgstr  ""
+
 #: lxc/init.go:53
 msgid   "Instance type"
 msgstr  ""
@@ -1385,11 +1381,11 @@ msgstr  ""
 msgid   "Invalid target %s"
 msgstr  ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid   "Ips:"
 msgstr  ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid   "IsSM: %s (%s)"
 msgstr  ""
@@ -1423,12 +1419,12 @@ msgstr  ""
 msgid   "Last used: never"
 msgstr  ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid   "Link detected: %v"
 msgstr  ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid   "Link speed: %dMbit/s (%s duplex)"
 msgstr  ""
@@ -1457,44 +1453,84 @@ msgstr  ""
 msgid   "List background operations"
 msgstr  ""
 
+#: lxc/image_alias.go:149
+msgid   "List image aliases"
+msgstr  ""
+
+#: lxc/image_alias.go:150
+msgid   "List image aliases\n"
+        "\n"
+        "Filters may be part of the image hash or part of the image alias name.\n"
+msgstr  ""
+
+#: lxc/image.go:967
+msgid   "List images"
+msgstr  ""
+
+#: lxc/image.go:968
+msgid   "List images\n"
+        "\n"
+        "Filters may be of the <key>=<value> form for property based filtering,\n"
+        "or part of the image hash or part of the image alias name.\n"
+        "\n"
+        "The -c option takes a (optionally comma-separated) list of arguments\n"
+        "that control which image attributes to output when displaying in table\n"
+        "or csv format.\n"
+        "\n"
+        "Default column layout is: lfpdasu\n"
+        "\n"
+        "Column shorthand chars:\n"
+        "\n"
+        "    l - Shortest image alias (and optionally number of other aliases)\n"
+        "    L - Newline-separated list of all image aliases\n"
+        "    f - Fingerprint (short)\n"
+        "    F - Fingerprint (long)\n"
+        "    p - Whether image is public\n"
+        "    d - Description\n"
+        "    a - Architecture\n"
+        "    s - Size\n"
+        "    u - Upload date\n"
+        "    t - Type"
+msgstr  ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid   "List container devices"
+msgid   "List instance devices"
 msgstr  ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid   "List container file templates"
+msgid   "List instance file templates"
 msgstr  ""
 
 #: lxc/list.go:43
-msgid   "List containers"
+msgid   "List instances"
 msgstr  ""
 
 #: lxc/list.go:44
-msgid   "List containers\n"
+msgid   "List instances\n"
         "\n"
         "Default column layout: ns46tS\n"
         "Fast column layout: nsacPt\n"
         "\n"
         "== Filters ==\n"
-        "A single keyword like \"web\" which will list any container with a name starting by \"web\".\n"
-        "A regular expression on the container name. (e.g. .*web.*01$).\n"
+        "A single keyword like \"web\" which will list any instance with a name starting by \"web\".\n"
+        "A regular expression on the instance name. (e.g. .*web.*01$).\n"
         "A key/value pair referring to a configuration item. For those, the\n"
         "namespace can be abbreviated to the smallest unambiguous identifier.\n"
         "\n"
         "Examples:\n"
-        "  - \"user.blah=abc\" will list all containers with the \"blah\" user property set to \"abc\".\n"
+        "  - \"user.blah=abc\" will list all instances with the \"blah\" user property set to \"abc\".\n"
         "  - \"u.blah=abc\" will do the same\n"
-        "  - \"security.privileged=true\" will list all privileged containers\n"
+        "  - \"security.privileged=true\" will list all privileged instances\n"
         "  - \"s.privileged=true\" will do the same\n"
         "\n"
         "A regular expression matching a configuration item or its value. (e.g. volatile.eth0.hwaddr=00:16:3e:.*).\n"
         "\n"
         "When multiple filters are passed, they are added one on top of the other,\n"
-        "selecting containers which satisfy them all.\n"
+        "selecting instances which satisfy them all.\n"
         "\n"
         "== Columns ==\n"
         "The -c option takes a comma separated list of arguments that control\n"
-        "which container attributes to output when displaying in table or csv\n"
+        "which instance attributes to output when displaying in table or csv\n"
         "format.\n"
         "\n"
         "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1512,12 +1548,12 @@ msgid   "List containers\n"
         "  l - Last used date\n"
         "  n - Name\n"
         "  N - Number of Processes\n"
-        "  p - PID of the container's init process\n"
+        "  p - PID of the instance's init process\n"
         "  P - Profiles\n"
         "  s - State\n"
         "  S - Number of snapshots\n"
         "  t - Type (persistent or ephemeral)\n"
-        "  L - Location of the container (e.g. its cluster member)\n"
+        "  L - Location of the instance (e.g. its cluster member)\n"
         "  f - Base Image Fingerprint (short)\n"
         "  F - Base Image Fingerprint (long)\n"
         "\n"
@@ -1530,46 +1566,6 @@ msgid   "List containers\n"
         "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr  ""
 
-#: lxc/image_alias.go:149
-msgid   "List image aliases"
-msgstr  ""
-
-#: lxc/image_alias.go:150
-msgid   "List image aliases\n"
-        "\n"
-        "Filters may be part of the image hash or part of the image alias name.\n"
-msgstr  ""
-
-#: lxc/image.go:967
-msgid   "List images"
-msgstr  ""
-
-#: lxc/image.go:968
-msgid   "List images\n"
-        "\n"
-        "Filters may be of the <key>=<value> form for property based filtering,\n"
-        "or part of the image hash or part of the image alias name.\n"
-        "\n"
-        "The -c option takes a (optionally comma-separated) list of arguments\n"
-        "that control which image attributes to output when displaying in table\n"
-        "or csv format.\n"
-        "\n"
-        "Default column layout is: lfpdasu\n"
-        "\n"
-        "Column shorthand chars:\n"
-        "\n"
-        "    l - Shortest image alias (and optionally number of other aliases)\n"
-        "    L - Newline-separated list of all image aliases\n"
-        "    f - Fingerprint (short)\n"
-        "    F - Fingerprint (long)\n"
-        "    p - Whether image is public\n"
-        "    d - Description\n"
-        "    a - Architecture\n"
-        "    s - Size\n"
-        "    u - Upload date\n"
-        "    t - Type"
-msgstr  ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid   "List profiles"
 msgstr  ""
@@ -1594,12 +1590,12 @@ msgstr  ""
 msgid   "List, show and delete background operations"
 msgstr  ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid   "Location: %s"
 msgstr  ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid   "Log:"
 msgstr  ""
 
@@ -1612,7 +1608,7 @@ msgstr  ""
 msgid   "MAC address: %s"
 msgstr  ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid   "MAD: %s (%s)"
 msgstr  ""
@@ -1639,7 +1635,7 @@ msgid   "Make the image public"
 msgstr  ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid   "Manage and attach containers to networks"
+msgid   "Manage and attach instances to networks"
 msgstr  ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1650,24 +1646,8 @@ msgstr  ""
 msgid   "Manage command aliases"
 msgstr  ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid   "Manage container and server configuration options"
-msgstr  ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid   "Manage container devices"
-msgstr  ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid   "Manage container file templates"
-msgstr  ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid   "Manage container metadata files"
-msgstr  ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid   "Manage files in containers"
+msgid   "Manage files in instances"
 msgstr  ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1681,8 +1661,8 @@ msgstr  ""
 #: lxc/image.go:38
 msgid   "Manage images\n"
         "\n"
-        "In LXD containers are created from images. Those images were themselves\n"
-        "either generated from an existing container or downloaded from an image\n"
+        "In LXD instances are created from images. Those images were themselves\n"
+        "either generated from an existing instance or downloaded from an image\n"
         "server.\n"
         "\n"
         "When using remote images, LXD will automatically cache images for you\n"
@@ -1696,6 +1676,22 @@ msgid   "Manage images\n"
         "hash or alias name (if one is set)."
 msgstr  ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid   "Manage instance and server configuration options"
+msgstr  ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid   "Manage instance devices"
+msgstr  ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid   "Manage instance file templates"
+msgstr  ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid   "Manage instance metadata files"
+msgstr  ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid   "Manage profiles"
 msgstr  ""
@@ -1726,7 +1722,7 @@ msgstr  ""
 msgid   "Manage trusted clients"
 msgstr  ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid   "Maximum number of VFs: %d"
 msgstr  ""
@@ -1741,19 +1737,19 @@ msgstr  ""
 msgid   "Member %s renamed to %s"
 msgstr  ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid   "Memory (current)"
 msgstr  ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid   "Memory (peak)"
 msgstr  ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid   "Memory usage:"
 msgstr  ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid   "Memory:"
 msgstr  ""
 
@@ -1769,12 +1765,8 @@ msgstr  ""
 msgid   "Minimum level for log messages"
 msgstr  ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199 lxc/config_template.go:90 lxc/config_template.go:133 lxc/config_template.go:175 lxc/config_template.go:262 lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid   "Missing container name"
-msgstr  ""
-
-#: lxc/profile.go:125
-msgid   "Missing container.name name"
+#: lxc/config_metadata.go:101 lxc/config_metadata.go:199 lxc/config_template.go:90 lxc/config_template.go:133 lxc/config_template.go:175 lxc/config_template.go:262 lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198 lxc/profile.go:660
+msgid   "Missing instance name"
 msgstr  ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285 lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541 lxc/config_device.go:637
@@ -1809,12 +1801,12 @@ msgstr  ""
 msgid   "Missing target directory"
 msgstr  ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid   "Model: %s"
 msgstr  ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid   "Model: %v"
 msgstr  ""
@@ -1838,21 +1830,21 @@ msgid   "More than one file to download, but target is not a directory"
 msgstr  ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid   "Move containers within or in between LXD instances"
+msgid   "Move instances within or in between LXD servers"
 msgstr  ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid   "Move storage volumes between pools"
 msgstr  ""
 
-#: lxc/move.go:54
-msgid   "Move the container without its snapshots (deprecated, use instance-only)"
-msgstr  ""
-
 #: lxc/move.go:55
 msgid   "Move the instance without its snapshots"
 msgstr  ""
 
+#: lxc/move.go:54
+msgid   "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr  ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid   "Moving the storage volume: %s"
@@ -1863,18 +1855,18 @@ msgid   "Must run as root to import from directory"
 msgstr  ""
 
 #: lxc/action.go:151
-msgid   "Must supply container name for: "
+msgid   "Must supply instance name for: "
 msgstr  ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620 lxc/project.go:449 lxc/remote.go:513 lxc/storage.go:558 lxc/storage_volume.go:1118
 msgid   "NAME"
 msgstr  ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid   "NIC:"
 msgstr  ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid   "NICs:"
 msgstr  ""
 
@@ -1882,30 +1874,30 @@ msgstr  ""
 msgid   "NO"
 msgstr  ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid   "NUMA node: %v"
 msgstr  ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid   "NUMA nodes:\n"
 msgstr  ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid   "NVIDIA information:"
 msgstr  ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid   "NVRM Version: %v"
 msgstr  ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid   "Name: %s"
 msgstr  ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid   "Name: %v"
 msgstr  ""
@@ -1934,7 +1926,7 @@ msgstr  ""
 msgid   "Network name"
 msgstr  ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid   "Network usage:"
 msgstr  ""
 
@@ -1971,13 +1963,13 @@ msgstr  ""
 msgid   "No value found in %q"
 msgstr  ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid   "Node %d:\n"
 msgstr  ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid   "Only \"custom\" volumes can be attached to containers"
+msgid   "Only \"custom\" volumes can be attached to instances"
 msgstr  ""
 
 #: lxc/storage_volume.go:1523
@@ -2009,7 +2001,7 @@ msgstr  ""
 msgid   "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr  ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid   "PCI address: %v"
 msgstr  ""
@@ -2034,15 +2026,15 @@ msgstr  ""
 msgid   "PUBLIC"
 msgstr  ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid   "Packets received"
 msgstr  ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid   "Packets sent"
 msgstr  ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid   "Partitions:"
 msgstr  ""
 
@@ -2052,24 +2044,24 @@ msgid   "Password for %s: "
 msgstr  ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid   "Pause containers"
+msgid   "Pause instances"
 msgstr  ""
 
 #: lxc/copy.go:57
 msgid   "Perform an incremental copy"
 msgstr  ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid   "Pid: %d"
 msgstr  ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid   "Port type: %s"
 msgstr  ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid   "Ports:"
 msgstr  ""
 
@@ -2097,7 +2089,7 @@ msgstr  ""
 msgid   "Print version number"
 msgstr  ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid   "Processes: %d"
 msgstr  ""
@@ -2107,7 +2099,7 @@ msgstr  ""
 msgid   "Processing aliases failed: %s"
 msgstr  ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid   "Product: %v (%v)"
 msgstr  ""
@@ -2143,11 +2135,11 @@ msgid   "Profile %s renamed to %s"
 msgstr  ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid   "Profile to apply to the new container"
+msgid   "Profile to apply to the new instance"
 msgstr  ""
 
 #: lxc/move.go:52
-msgid   "Profile to apply to the target container"
+msgid   "Profile to apply to the target instance"
 msgstr  ""
 
 #: lxc/profile.go:227
@@ -2163,7 +2155,7 @@ msgstr  ""
 msgid   "Profiles: "
 msgstr  ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid   "Profiles: %s"
 msgstr  ""
@@ -2197,16 +2189,16 @@ msgid   "Public: %s"
 msgstr  ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid   "Publish containers as images"
+msgid   "Publish instances as images"
 msgstr  ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid   "Publishing container: %s"
+msgid   "Publishing instance: %s"
 msgstr  ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid   "Pull files from containers"
+msgid   "Pull files from instances"
 msgstr  ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2215,7 +2207,7 @@ msgid   "Pulling %s from %s: %%s"
 msgstr  ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid   "Push files into containers"
+msgid   "Push files into instances"
 msgstr  ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2227,7 +2219,7 @@ msgstr  ""
 msgid   "Query virtual machine images"
 msgstr  ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid   "Read-Only: %v"
 msgstr  ""
@@ -2242,7 +2234,7 @@ msgstr  ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid   "Refreshing container: %s"
+msgid   "Refreshing instance: %s"
 msgstr  ""
 
 #: lxc/image.go:1294
@@ -2278,12 +2270,12 @@ msgstr  ""
 msgid   "Remote operation canceled by user"
 msgstr  ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid   "Remote: %s"
 msgstr  ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid   "Removable: %v"
 msgstr  ""
@@ -2302,11 +2294,11 @@ msgid   "Remove aliases"
 msgstr  ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid   "Remove container devices"
+msgid   "Remove instance devices"
 msgstr  ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid   "Remove profiles from containers"
+msgid   "Remove profiles from instances"
 msgstr  ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2326,7 +2318,7 @@ msgid   "Rename aliases"
 msgstr  ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid   "Rename containers and snapshots"
+msgid   "Rename instances and snapshots"
 msgstr  ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2358,7 +2350,7 @@ msgstr  ""
 msgid   "Renamed storage volume from \"%s\" to \"%s\""
 msgstr  ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid   "Render: %s (%s)"
 msgstr  ""
@@ -2367,36 +2359,36 @@ msgstr  ""
 msgid   "Require user confirmation"
 msgstr  ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid   "Resources:"
 msgstr  ""
 
 #: lxc/action.go:69
-msgid   "Restart containers"
+msgid   "Restart insances"
 msgstr  ""
 
 #: lxc/action.go:70
-msgid   "Restart containers\n"
+msgid   "Restart instances\n"
         "\n"
         "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr  ""
 
-#: lxc/restore.go:23
-msgid   "Restore containers from snapshots"
-msgstr  ""
-
 #: lxc/restore.go:24
-msgid   "Restore containers from snapshots\n"
+msgid   "Restore instaces from snapshots\n"
         "\n"
         "If --stateful is passed, then the running state will be restored too."
 msgstr  ""
 
+#: lxc/restore.go:23
+msgid   "Restore instances from snapshots"
+msgstr  ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid   "Restore storage volume snapshots"
 msgstr  ""
 
 #: lxc/console.go:39
-msgid   "Retrieve the container's console log"
+msgid   "Retrieve the instance's console log"
 msgstr  ""
 
 #: lxc/init.go:285
@@ -2405,7 +2397,7 @@ msgid   "Retrieving image: %s"
 msgstr  ""
 
 #: lxc/action.go:111
-msgid   "Run command against all containers"
+msgid   "Run against all instances"
 msgstr  ""
 
 #: lxc/image.go:1009
@@ -2420,7 +2412,7 @@ msgstr  ""
 msgid   "SOURCE"
 msgstr  ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid   "SR-IOV information:"
 msgstr  ""
 
@@ -2466,32 +2458,32 @@ msgid   "Server version: %s\n"
 msgstr  ""
 
 #: lxc/config_device.go:505
-msgid   "Set container device configuration keys"
+msgid   "Set instance device configuration keys"
 msgstr  ""
 
 #: lxc/config_device.go:507
-msgid   "Set container device configuration keys\n"
+msgid   "Set instance device configuration keys\n"
         "\n"
         "For backward compatibility, a single configuration key may still be set with:\n"
-        "    lxc config device set [<remote>:]<container> <device> <key> <value>"
+        "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr  ""
 
 #: lxc/config_device.go:513
-msgid   "Set container device configuration keys\n"
+msgid   "Set instance device configuration keys\n"
         "\n"
         "For backward compatibility, a single configuration key may still be set with:\n"
         "    lxc profile device set [<remote>:]<profile> <device> <key> <value>"
 msgstr  ""
 
 #: lxc/config.go:453
-msgid   "Set container or server configuration keys"
+msgid   "Set instance or server configuration keys"
 msgstr  ""
 
 #: lxc/config.go:454
-msgid   "Set container or server configuration keys\n"
+msgid   "Set instance or server configuration keys\n"
         "\n"
         "For backward compatibility, a single configuration key may still be set with:\n"
-        "    lxc config set [<remote>:][<container>] <key> <value>"
+        "    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr  ""
 
 #: lxc/network.go:1010
@@ -2573,20 +2565,8 @@ msgstr  ""
 msgid   "Show all information messages"
 msgstr  ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid   "Show container metadata files"
-msgstr  ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid   "Show container or server configurations"
-msgstr  ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid   "Show container or server information"
-msgstr  ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid   "Show content of container file templates"
+msgid   "Show content of instance file templates"
 msgstr  ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2598,13 +2578,25 @@ msgid   "Show details on a background operation"
 msgstr  ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid   "Show full device configuration for containers or profiles"
+msgid   "Show full device configuration for instances or profiles"
 msgstr  ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid   "Show image properties"
 msgstr  ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid   "Show instance metadata files"
+msgstr  ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid   "Show instance or server configurations"
+msgstr  ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid   "Show instance or server information"
+msgstr  ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid   "Show less common commands"
 msgstr  ""
@@ -2637,10 +2629,6 @@ msgstr  ""
 msgid   "Show storage volume configurations"
 msgstr  ""
 
-#: lxc/info.go:42
-msgid   "Show the container's last 100 log lines?"
-msgstr  ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid   "Show the default remote"
 msgstr  ""
@@ -2650,6 +2638,10 @@ msgid   "Show the expanded configuration"
 msgstr  ""
 
 #: lxc/info.go:43
+msgid   "Show the instance's last 100 log lines?"
+msgstr  ""
+
+#: lxc/info.go:44
 msgid   "Show the resources available to the server"
 msgstr  ""
 
@@ -2674,7 +2666,7 @@ msgstr  ""
 msgid   "Size: %.2fMB"
 msgstr  ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid   "Size: %s"
 msgstr  ""
@@ -2683,18 +2675,18 @@ msgstr  ""
 msgid   "Snapshot storage volumes"
 msgstr  ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid   "Snapshots:"
 msgstr  ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid   "Socket %d:"
 msgstr  ""
 
 #: lxc/action.go:269
 #, c-format
-msgid   "Some containers failed to %s"
+msgid   "Some instances failed to %s"
 msgstr  ""
 
 #: lxc/image.go:936
@@ -2702,7 +2694,7 @@ msgid   "Source:"
 msgstr  ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid   "Start containers"
+msgid   "Start instances"
 msgstr  ""
 
 #: lxc/launch.go:68
@@ -2715,26 +2707,26 @@ msgstr  ""
 msgid   "State: %s"
 msgstr  ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid   "Status: %s"
 msgstr  ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid   "Stop containers"
+msgid   "Stop instances"
 msgstr  ""
 
 #: lxc/publish.go:41
-msgid   "Stop the container if currently running"
+msgid   "Stop the instance if currently running"
 msgstr  ""
 
 #: lxc/publish.go:145
-msgid   "Stopping container failed!"
+msgid   "Stopping instance failed!"
 msgstr  ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid   "Stopping the container failed: %s"
+msgid   "Stopping the instance failed: %s"
 msgstr  ""
 
 #: lxc/storage.go:145
@@ -2775,24 +2767,24 @@ msgid   "Storage volume moved successfully!"
 msgstr  ""
 
 #: lxc/action.go:114
-msgid   "Store the container state"
+msgid   "Store the instance state"
 msgstr  ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid   "Supported modes: %s"
 msgstr  ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid   "Supported ports: %s"
 msgstr  ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid   "Swap (current)"
 msgstr  ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid   "Swap (peak)"
 msgstr  ""
 
@@ -2812,11 +2804,7 @@ msgstr  ""
 msgid   "TYPE"
 msgstr  ""
 
-#: lxc/move.go:161
-msgid   "The --container-only flag can't be used with --target"
-msgstr  ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid   "The --instance-only flag can't be used with --target"
 msgstr  ""
 
@@ -2828,24 +2816,24 @@ msgstr  ""
 msgid   "The --stateless flag can't be used with --target"
 msgstr  ""
 
-#: lxc/delete.go:104
-msgid   "The container is currently running, stop it first or pass --force"
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid   "The device already exists"
 msgstr  ""
 
-#: lxc/publish.go:110
-msgid   "The container is currently running. Use --force to have it stopped and restarted"
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453 lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid   "The device doesn't exist"
 msgstr  ""
 
-#: lxc/init.go:388
-msgid   "The container you are starting doesn't have any network attached to it."
+#: lxc/delete.go:104
+msgid   "The instance is currently running, stop it first or pass --force"
 msgstr  ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid   "The device already exists"
+#: lxc/publish.go:110
+msgid   "The instance is currently running. Use --force to have it stopped and restarted"
 msgstr  ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453 lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid   "The device doesn't exist"
+#: lxc/init.go:388
+msgid   "The instance you are starting doesn't have any network attached to it."
 msgstr  ""
 
 #: lxc/init.go:372
@@ -2863,7 +2851,7 @@ msgid   "The profile device doesn't exist"
 msgstr  ""
 
 #: lxc/move.go:236
-msgid   "The source LXD instance is not clustered"
+msgid   "The source LXD server is not clustered"
 msgstr  ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673 lxc/storage_volume.go:754
@@ -2880,18 +2868,18 @@ msgstr  ""
 
 #: lxc/main.go:242
 msgid   "This client hasn't been configured to use a remote LXD server yet.\n"
-        "As your platform can't run native Linux containers, you must connect to a remote LXD server.\n"
+        "As your platform can't run native Linux instances, you must connect to a remote LXD server.\n"
         "\n"
         "If you already added a remote server, make it the default with \"lxc remote switch NAME\".\n"
         "To easily setup a local LXD server in a virtual machine, consider using: https://multipass.run"
 msgstr  ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid   "Threads:"
 msgstr  ""
 
 #: lxc/action.go:121
-msgid   "Time to wait for the container before killing it"
+msgid   "Time to wait for the instance before killing it"
 msgstr  ""
 
 #: lxc/image.go:897
@@ -2899,7 +2887,7 @@ msgid   "Timestamps:"
 msgstr  ""
 
 #: lxc/init.go:390
-msgid   "To attach a network to a container, use: lxc network attach"
+msgid   "To attach a network to an instance, use: lxc network attach"
 msgstr  ""
 
 #: lxc/init.go:389
@@ -2911,19 +2899,19 @@ msgid   "To detach from the console, press: <ctrl>+a q"
 msgstr  ""
 
 #: lxc/main.go:345
-msgid   "To start your first container, try: lxc launch ubuntu:18.04"
+msgid   "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr  ""
 
-#: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617 lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617 lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid   "To use --target, the destination remote must be a cluster"
 msgstr  ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid   "Total: %v"
 msgstr  ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid   "Transceiver type: %s"
 msgstr  ""
@@ -2940,14 +2928,14 @@ msgstr  ""
 msgid   "Transfer mode. One of pull (default), push or relay."
 msgstr  ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid   "Transferring container: %s"
+msgid   "Transferring image: %s"
 msgstr  ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid   "Transferring image: %s"
+msgid   "Transferring instance: %s"
 msgstr  ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -2955,12 +2943,12 @@ msgstr  ""
 msgid   "Try `lxc info --show-log %s` for more info"
 msgstr  ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid   "Type: %s"
 msgstr  ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid   "Type: %s (ephemeral)"
 msgstr  ""
@@ -2977,7 +2965,7 @@ msgstr  ""
 msgid   "USED BY"
 msgstr  ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid   "UUID: %v"
 msgstr  ""
@@ -2998,15 +2986,15 @@ msgid   "Unknown file type '%s'"
 msgstr  ""
 
 #: lxc/move.go:53
-msgid   "Unset all profiles on the target container"
+msgid   "Unset all profiles on the target instance"
 msgstr  ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid   "Unset container device configuration keys"
+msgid   "Unset instance device configuration keys"
 msgstr  ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid   "Unset container or server configuration keys"
+msgid   "Unset instance or server configuration keys"
 msgstr  ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3029,6 +3017,11 @@ msgstr  ""
 msgid   "Unset storage volume configuration keys"
 msgstr  ""
 
+#: lxc/info.go:605
+#, c-format
+msgid   "Unsupported instance type: %s"
+msgstr  ""
+
 #: lxc/image.go:904
 #, c-format
 msgid   "Uploaded: %s"
@@ -3038,7 +3031,7 @@ msgstr  ""
 msgid   "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr  ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid   "Used: %v"
 msgstr  ""
@@ -3055,27 +3048,27 @@ msgstr  ""
 msgid   "User signaled us three times, exiting. The remote operation will keep running"
 msgstr  ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid   "VFs: %d"
 msgstr  ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid   "Vendor: %v"
 msgstr  ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid   "Vendor: %v (%v)"
 msgstr  ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid   "Verb: %s (%s)"
 msgstr  ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid   "WWN: %s"
 msgstr  ""
@@ -3093,11 +3086,11 @@ msgid   "Whether or not to only backup the instance (without snapshots)"
 msgstr  ""
 
 #: lxc/restore.go:36
-msgid   "Whether or not to restore the container's running state from snapshot (if available)"
+msgid   "Whether or not to restore the instance's running state from snapshot (if available)"
 msgstr  ""
 
 #: lxc/snapshot.go:34
-msgid   "Whether or not to snapshot the container's running state"
+msgid   "Whether or not to snapshot the instance's running state"
 msgstr  ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430 lxc/project.go:435 lxc/remote.go:478 lxc/remote.go:483
@@ -3113,11 +3106,11 @@ msgid   "You can't pass -t or -T at the same time as --mode"
 msgstr  ""
 
 #: lxc/copy.go:82
-msgid   "You must specify a destination container name when using --target"
+msgid   "You must specify a destination instance name when using --target"
 msgstr  ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid   "You must specify a source container name"
+msgid   "You must specify a source instance name"
 msgstr  ""
 
 #: lxc/alias.go:52
@@ -3129,11 +3122,11 @@ msgid   "add [<remote>:] <cert>"
 msgstr  ""
 
 #: lxc/profile.go:99
-msgid   "add [<remote>:]<container> <profile>"
+msgid   "add [<remote>:]<instance> <profile>"
 msgstr  ""
 
 #: lxc/config_device.go:74
-msgid   "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid   "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr  ""
 
 #: lxc/remote.go:83
@@ -3145,15 +3138,15 @@ msgid   "alias"
 msgstr  ""
 
 #: lxc/profile.go:161
-msgid   "assign [<remote>:]<container> <profiles>"
+msgid   "assign [<remote>:]<instance> <profiles>"
 msgstr  ""
 
 #: lxc/network.go:106
-msgid   "attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+msgid   "attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr  ""
 
 #: lxc/storage_volume.go:137
-msgid   "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid   "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr  ""
 
 #: lxc/storage_volume.go:216
@@ -3173,7 +3166,7 @@ msgid   "config"
 msgstr  ""
 
 #: lxc/console.go:30
-msgid   "console [<remote>:]<container>"
+msgid   "console [<remote>:]<instance>"
 msgstr  ""
 
 #: lxc/storage_volume.go:298
@@ -3197,7 +3190,7 @@ msgid   "create [<remote>:]<alias> <fingerprint>"
 msgstr  ""
 
 #: lxc/config_template.go:64
-msgid   "create [<remote>:]<container> <template>"
+msgid   "create [<remote>:]<instance> <template>"
 msgstr  ""
 
 #: lxc/network.go:252
@@ -3232,20 +3225,20 @@ msgstr  ""
 msgid   "delete [<remote>:]<alias>"
 msgstr  ""
 
+#: lxc/image.go:267
+msgid   "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr  ""
+
 #: lxc/config_template.go:106
-msgid   "delete [<remote>:]<container> <template>"
+msgid   "delete [<remote>:]<instance> <template>"
 msgstr  ""
 
 #: lxc/file.go:102
-msgid   "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid   "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr  ""
 
 #: lxc/delete.go:27
-msgid   "delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/<snapshot>]...]"
-msgstr  ""
-
-#: lxc/image.go:267
-msgid   "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgid   "delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/<snapshot>]...]"
 msgstr  ""
 
 #: lxc/network.go:323
@@ -3277,11 +3270,11 @@ msgid   "description"
 msgstr  ""
 
 #: lxc/network.go:374
-msgid   "detach [<remote>:]<network> <container> [<device name>]"
+msgid   "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr  ""
 
 #: lxc/storage_volume.go:613
-msgid   "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid   "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr  ""
 
 #: lxc/storage_volume.go:695
@@ -3289,7 +3282,7 @@ msgid   "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr  ""
 
 #: lxc/network.go:459
-msgid   "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid   "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr  ""
 
 #: lxc/config_device.go:22
@@ -3304,20 +3297,20 @@ msgstr  ""
 msgid   "driver"
 msgstr  ""
 
+#: lxc/image.go:319
+msgid   "edit [<remote>:]<image>"
+msgstr  ""
+
 #: lxc/config_metadata.go:51
-msgid   "edit [<remote>:]<container>"
+msgid   "edit [<remote>:]<instance>"
 msgstr  ""
 
 #: lxc/config_template.go:149
-msgid   "edit [<remote>:]<container> <template>"
+msgid   "edit [<remote>:]<instance> <template>"
 msgstr  ""
 
 #: lxc/file.go:152
-msgid   "edit [<remote>:]<container>/<path>"
-msgstr  ""
-
-#: lxc/image.go:319
-msgid   "edit [<remote>:]<image>"
+msgid   "edit [<remote>:]<instance>/<path>"
 msgstr  ""
 
 #: lxc/network.go:544
@@ -3341,7 +3334,7 @@ msgid   "edit [<remote>:]<project>"
 msgstr  ""
 
 #: lxc/config.go:88
-msgid   "edit [<remote>:][<container>[/<snapshot>]]"
+msgid   "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
 #: lxc/cluster.go:329
@@ -3358,28 +3351,28 @@ msgid   "error: %v"
 msgstr  ""
 
 #: lxc/exec.go:39
-msgid   "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid   "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr  ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid   "expires at %s"
 msgstr  ""
 
-#: lxc/export.go:31
-msgid   "export [<remote>:]<container> [target] [--container-only] [--optimized-storage]"
-msgstr  ""
-
 #: lxc/image.go:444
 msgid   "export [<remote>:]<image> [<target>]"
 msgstr  ""
 
+#: lxc/export.go:31
+msgid   "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr  ""
+
 #: lxc/file.go:70
 msgid   "file"
 msgstr  ""
 
 #: lxc/config_device.go:186
-msgid   "get [<remote>:]<container|profile> <device> <key>"
+msgid   "get [<remote>:]<instance|profile> <device> <key>"
 msgstr  ""
 
 #: lxc/network.go:667
@@ -3403,7 +3396,7 @@ msgid   "get [<remote>:]<project> <key>"
 msgstr  ""
 
 #: lxc/config.go:371
-msgid   "get [<remote>:][<container>] <key>"
+msgid   "get [<remote>:][<instance>] <key>"
 msgstr  ""
 
 #: lxc/remote.go:417
@@ -3438,8 +3431,8 @@ msgstr  ""
 msgid   "info [<remote>:]<pool>"
 msgstr  ""
 
-#: lxc/info.go:30
-msgid   "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid   "info [<remote>:][<instance>]"
 msgstr  ""
 
 #: lxc/init.go:38
@@ -3467,11 +3460,11 @@ msgid   "list [<remote>:] [<filters>...]"
 msgstr  ""
 
 #: lxc/config_template.go:235
-msgid   "list [<remote>:]<container>"
+msgid   "list [<remote>:]<instance>"
 msgstr  ""
 
 #: lxc/config_device.go:258
-msgid   "list [<remote>:]<container|profile>"
+msgid   "list [<remote>:]<instance|profile>"
 msgstr  ""
 
 #: lxc/storage_volume.go:1066
@@ -3498,18 +3491,18 @@ msgid   "lxc alias rename list my-list\n"
 msgstr  ""
 
 #: lxc/config_device.go:79
-msgid   "lxc config device add [<remote>:]container1 <device-name> disk source=/share/c1 path=opt\n"
-        "    Will mount the host's /share/c1 onto /opt in the container."
+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:92
-msgid   "lxc config edit <container> < container.yaml\n"
-        "    Update the container configuration from config.yaml."
+msgid   "lxc config edit <instance> < instance.yaml\n"
+        "    Update the instance configuration from config.yaml."
 msgstr  ""
 
 #: lxc/config.go:459
-msgid   "lxc config set [<remote>:]<container> limits.cpu=2\n"
-        "    Will set a CPU limit of \"2\" for the container.\n"
+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"
@@ -3520,17 +3513,17 @@ msgstr  ""
 
 #: lxc/export.go:35
 msgid   "lxc export u1 backup0.tar.gz\n"
-        "    Download a backup tarball of the u1 container."
+        "    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 container and write it to the current directory."
+        "   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 container \"foo\"."
+        "   To push /etc/hosts into the instance \"foo\"."
 msgstr  ""
 
 #: lxc/image.go:323
@@ -3543,12 +3536,12 @@ msgstr  ""
 
 #: lxc/import.go:30
 msgid   "lxc import backup0.tar.gz\n"
-        "    Create a new container using backup0.tar.gz as the source."
+        "    Create a new instance using backup0.tar.gz as the source."
 msgstr  ""
 
-#: lxc/info.go:34
-msgid   "lxc info [<remote>:]<container> [--show-log]\n"
-        "    For container information.\n"
+#: 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."
@@ -3558,20 +3551,20 @@ msgstr  ""
 msgid   "lxc init ubuntu:16.04 u1\n"
         "\n"
         "lxc init ubuntu:16.04 u1 < config.yaml\n"
-        "    Create the container with configuration from config.yaml"
+        "    Create the instance with configuration from config.yaml"
 msgstr  ""
 
 #: lxc/launch.go:25
 msgid   "lxc launch ubuntu:16.04 u1\n"
         "\n"
         "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-        "    Create and start the container with configuration from config.yaml"
+        "    Create and start the instance with configuration from config.yaml"
 msgstr  ""
 
 #: lxc/list.go:104
 msgid   "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0.parent:ETHP\n"
-        "  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", \"IPV6\" and \"MAC\" columns.\n"
-        "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from container configuration keys.\n"
+        "  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", \"IPV6\" and \"MAC\" columns.\n"
+        "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from instance configuration keys.\n"
         "  \"ETHP\" is a custom column generated from a device key.\n"
         "\n"
         "lxc list -c ns,user.comment:comment\n"
@@ -3590,13 +3583,13 @@ msgid   "lxc monitor --type=logging\n"
 msgstr  ""
 
 #: lxc/move.go:39
-msgid   "lxc move [<remote>:]<source container> [<remote>:][<destination container>] [--container-only]\n"
-        "    Move a container between two hosts, renaming it if destination name differs.\n"
+msgid   "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--instance-only]\n"
+        "    Move an instance between two hosts, renaming it if destination name differs.\n"
         "\n"
-        "lxc move <old name> <new name> [--container-only]\n"
-        "    Rename a local container.\n"
+        "lxc move <old name> <new name> [--instance-only]\n"
+        "    Rename a local instance.\n"
         "\n"
-        "lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+        "lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
         "    Rename a snapshot."
 msgstr  ""
 
@@ -3618,7 +3611,7 @@ msgstr  ""
 
 #: lxc/config_device.go:83
 msgid   "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/c1 path=opt\n"
-        "    Will mount the host's /share/c1 onto /opt in the container."
+        "    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr  ""
 
 #: lxc/profile.go:406
@@ -3632,8 +3625,8 @@ msgid   "lxc project edit <project> < project.yaml\n"
 msgstr  ""
 
 #: lxc/query.go:33
-msgid   "lxc query -X DELETE --wait /1.0/containers/c1\n"
-        "    Delete local container \"c1\"."
+msgid   "lxc query -X DELETE --wait /1.0/instances/c1\n"
+        "    Delete local instance \"c1\"."
 msgstr  ""
 
 #: lxc/snapshot.go:29
@@ -3684,7 +3677,7 @@ msgid   "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr  ""
 
 #: lxc/move.go:34
-msgid   "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/<snapshot>]]"
+msgid   "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
 #: lxc/storage.go:444
@@ -3708,11 +3701,11 @@ msgid   "operation"
 msgstr  ""
 
 #: lxc/config_device.go:325
-msgid   "override [<remote>:]<container> <device> [key=value...]"
+msgid   "override [<remote>:]<instance> <device> [key=value...]"
 msgstr  ""
 
 #: lxc/action.go:48
-msgid   "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid   "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr  ""
 
 #: lxc/config.go:54
@@ -3728,15 +3721,15 @@ msgid   "project"
 msgstr  ""
 
 #: lxc/publish.go:33
-msgid   "publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] [key=value...]"
+msgid   "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr  ""
 
 #: lxc/file.go:215
-msgid   "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] <target path>"
+msgid   "pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target path>"
 msgstr  ""
 
 #: lxc/file.go:405
-msgid   "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid   "push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr  ""
 
 #: lxc/query.go:29
@@ -3764,11 +3757,11 @@ msgid   "remove [<remote>:] <hostname|fingerprint>"
 msgstr  ""
 
 #: lxc/profile.go:634
-msgid   "remove [<remote>:]<container> <profile>"
+msgid   "remove [<remote>:]<instance> <profile>"
 msgstr  ""
 
 #: lxc/config_device.go:413
-msgid   "remove [<remote>:]<container|profile> <name>..."
+msgid   "remove [<remote>:]<instance|profile> <name>..."
 msgstr  ""
 
 #: lxc/cluster.go:243
@@ -3788,7 +3781,7 @@ msgid   "rename [<remote>:]<alias> <new-name>"
 msgstr  ""
 
 #: lxc/rename.go:19
-msgid   "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid   "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr  ""
 
 #: lxc/cluster.go:193
@@ -3812,11 +3805,11 @@ msgid   "rename [<remote>:]<project> <new-name>"
 msgstr  ""
 
 #: lxc/action.go:68
-msgid   "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid   "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr  ""
 
 #: lxc/restore.go:22
-msgid   "restore [<remote>:]<container> <snapshot>"
+msgid   "restore [<remote>:]<instance> <snapshot>"
 msgstr  ""
 
 #: lxc/storage_volume.go:1561
@@ -3824,7 +3817,7 @@ msgid   "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr  ""
 
 #: lxc/config_device.go:504
-msgid   "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid   "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr  ""
 
 #: lxc/network.go:1009
@@ -3848,27 +3841,27 @@ msgid   "set [<remote>:]<project> <key>=<value>..."
 msgstr  ""
 
 #: lxc/config.go:452
-msgid   "set [<remote>:][<container>] <key>=<value>..."
+msgid   "set [<remote>:][<instance>] <key>=<value>..."
 msgstr  ""
 
 #: lxc/remote.go:683
 msgid   "set-url <remote> <URL>"
 msgstr  ""
 
+#: lxc/image.go:1343
+msgid   "show [<remote>:]<image>"
+msgstr  ""
+
 #: lxc/config_metadata.go:173
-msgid   "show [<remote>:]<container>"
+msgid   "show [<remote>:]<instance>"
 msgstr  ""
 
 #: lxc/config_template.go:294
-msgid   "show [<remote>:]<container> <template>"
+msgid   "show [<remote>:]<instance> <template>"
 msgstr  ""
 
 #: lxc/config_device.go:611
-msgid   "show [<remote>:]<container|profile>"
-msgstr  ""
-
-#: lxc/image.go:1343
-msgid   "show [<remote>:]<image>"
+msgid   "show [<remote>:]<instance|profile>"
 msgstr  ""
 
 #: lxc/cluster.go:144
@@ -3900,11 +3893,11 @@ msgid   "show [<remote>:]<project>"
 msgstr  ""
 
 #: lxc/config.go:578
-msgid   "show [<remote>:][<container>[/<snapshot>]]"
+msgid   "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
 #: lxc/snapshot.go:22
-msgid   "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid   "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr  ""
 
 #: lxc/storage_volume.go:1490
@@ -3916,19 +3909,19 @@ msgid   "space used"
 msgstr  ""
 
 #: lxc/action.go:29
-msgid   "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid   "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr  ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid   "stateful"
 msgstr  ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid   "stateless"
 msgstr  ""
 
 #: lxc/action.go:89
-msgid   "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid   "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr  ""
 
 #: lxc/storage.go:31
@@ -3943,7 +3936,7 @@ msgstr  ""
 msgid   "switch [<remote>:] <project>"
 msgstr  ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid   "taken at %s"
 msgstr  ""
@@ -3965,7 +3958,7 @@ msgid   "unreachable"
 msgstr  ""
 
 #: lxc/config_device.go:679
-msgid   "unset [<remote>:]<container|profile> <device> <key>"
+msgid   "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr  ""
 
 #: lxc/network.go:1141
@@ -3989,7 +3982,7 @@ msgid   "unset [<remote>:]<project> <key>"
 msgstr  ""
 
 #: lxc/config.go:697
-msgid   "unset [<remote>:][<container>] <key>"
+msgid   "unset [<remote>:][<instance>] <key>"
 msgstr  ""
 
 #: lxc/storage.go:442
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 5c5f96d447..b3ae86db00 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/nl.po b/po/nl.po
index 4dbf789112..96e0be0d49 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\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/"
@@ -74,12 +74,13 @@ msgstr ""
 "###  size: \"61203283968\""
 
 #: lxc/config.go:103
+#, fuzzy
 msgid ""
 "### This is a yaml representation of the configuration.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -111,9 +112,26 @@ msgstr ""
 "###\n"
 "### NB: de naam is weergegeven, maar kan niet worden veranderd"
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+"### Dit is een yaml weergave van de image eigenschappen.\n"
+"## Elke regel beginnende met een '# zal worden genegeerd.\n"
+"###\n"
+"### Elke eigenschap is weergegeven met een enkele regel:\n"
+"### Bijvoorbeeld:\n"
+"###  description: Mijn eigen image"
+
 #: lxc/config_metadata.go:62
+#, fuzzy
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -134,22 +152,23 @@ msgid ""
 "###     template: template.tpl\n"
 "###     properties: {}"
 msgstr ""
-
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
+"### Dit is een yaml weergave van de configuratie.\n"
+"### Elke regel beginnende met een '# zal worden genegeerd.\n"
 "###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-"### Dit is een yaml weergave van de image eigenschappen.\n"
-"## Elke regel beginnende met een '# zal worden genegeerd.\n"
+"### Een voorbeeld configuratie ziet er als volgt uit:\n"
+"### name: container1\n"
+"### profiles:\n"
+"### - default\n"
+"### config:\n"
+"###   volatile.eth0.hwaddr: 00:16:3e:e9:f8:7f\n"
+"### devices:\n"
+"###   homedir:\n"
+"###     path: /extra\n"
+"###     source: /home/user\n"
+"###     type: disk\n"
+"### ephemeral: false\n"
 "###\n"
-"### Elke eigenschap is weergegeven met een enkele regel:\n"
-"### Bijvoorbeeld:\n"
-"###  description: Mijn eigen image"
+"### NB: de naam is weergegeven, maar kan niet worden veranderd"
 
 #: lxc/network.go:555
 msgid ""
@@ -209,7 +228,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -238,38 +257,35 @@ msgstr ""
 msgid "(none)"
 msgstr "(geen)"
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -298,7 +314,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -326,10 +342,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -357,22 +373,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -380,11 +396,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -392,14 +408,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -408,7 +424,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -448,19 +464,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -472,20 +488,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -498,7 +514,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -508,7 +524,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -558,12 +574,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -583,7 +599,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -617,7 +633,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -625,7 +641,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -639,32 +655,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -677,6 +680,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -689,15 +696,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -720,12 +726,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -733,16 +739,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -750,29 +760,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -790,14 +800,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -811,7 +817,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -829,7 +835,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -845,16 +851,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -865,6 +863,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -906,7 +912,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -938,7 +944,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -946,7 +952,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -973,7 +979,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -998,20 +1004,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -1023,7 +1029,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1042,24 +1048,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1088,14 +1094,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1111,7 +1117,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1124,19 +1130,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1163,11 +1169,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1234,11 +1240,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1253,12 +1259,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1277,26 +1283,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1313,11 +1319,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1348,7 +1354,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1356,12 +1362,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1393,11 +1399,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1431,11 +1437,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1449,12 +1451,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1462,11 +1468,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1535,11 +1550,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1574,12 +1589,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1608,48 +1623,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1667,12 +1724,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1687,48 +1744,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1753,12 +1768,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1771,7 +1786,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1798,7 +1813,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1809,24 +1824,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1841,8 +1840,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1856,6 +1855,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1888,7 +1903,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1903,19 +1918,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1934,12 +1949,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1989,12 +2001,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -2020,22 +2032,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -2046,7 +2057,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2055,11 +2066,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2068,30 +2079,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2120,7 +2131,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2157,13 +2168,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2195,7 +2206,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2220,15 +2231,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2238,24 +2249,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2285,7 +2296,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2295,7 +2306,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2331,11 +2342,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2351,7 +2362,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2385,16 +2396,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2403,7 +2414,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2415,7 +2426,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2430,7 +2441,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2467,12 +2478,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2491,11 +2502,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2516,7 +2527,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2548,7 +2559,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2557,38 +2568,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2597,7 +2608,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2612,7 +2623,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2658,21 +2669,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2680,16 +2691,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2781,20 +2792,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2806,13 +2805,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2845,10 +2856,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2858,6 +2865,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2882,7 +2893,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2891,18 +2902,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2910,7 +2921,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2923,26 +2934,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2983,24 +2994,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -3021,11 +3032,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -3037,27 +3044,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3075,7 +3082,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3094,7 +3101,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3103,12 +3110,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3116,7 +3123,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3128,20 +3135,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3158,14 +3165,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3173,12 +3180,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3196,7 +3203,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3217,15 +3224,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3248,6 +3255,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3258,7 +3270,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3276,27 +3288,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3317,12 +3329,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3339,11 +3351,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3355,11 +3367,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3371,16 +3383,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3403,7 +3415,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3427,7 +3439,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3462,24 +3474,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3509,11 +3521,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3521,7 +3533,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3536,20 +3548,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3573,7 +3585,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3590,30 +3602,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3637,7 +3648,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3674,8 +3685,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3704,11 +3715,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3739,21 +3750,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3765,20 +3776,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3793,13 +3804,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3810,7 +3821,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3818,17 +3829,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3849,15 +3860,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3883,7 +3894,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3900,8 +3911,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3960,8 +3971,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3985,11 +3995,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -4006,19 +4016,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -4047,11 +4056,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4071,7 +4080,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4097,11 +4106,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4109,7 +4118,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4133,27 +4142,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4185,11 +4194,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4201,19 +4210,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4228,7 +4237,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4250,7 +4259,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4274,7 +4283,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/pa.po b/po/pa.po
index 52d001ba78..39fe1fa9db 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/pl.po b/po/pl.po
index be1866e58c..89dc3e121e 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\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/"
@@ -62,12 +62,13 @@ msgstr ""
 "###   size: \"61203283968\""
 
 #: lxc/config.go:103
+#, fuzzy
 msgid ""
 "### This is a yaml representation of the configuration.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -99,9 +100,20 @@ msgstr ""
 "###\n"
 "### Nazwa jest widoczna, ale nie może zostać zmieniona"
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
+#, fuzzy
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -122,16 +134,23 @@ msgid ""
 "###     template: template.tpl\n"
 "###     properties: {}"
 msgstr ""
-
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
+"### To jest przedstawienie konfiguracji w yaml.\n"
+"### Każdy wiersz zaczynający się od '# zostanie pominięty.\n"
 "###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
+"### Przykładowa konfiguracja:\n"
+"### name: container1\n"
+"### profiles:\n"
+"### - default\n"
+"### config:\n"
+"###   volatile.eth0.hwaddr: 00:16:3e:e9:f8:7f\n"
+"### devices:\n"
+"###   homedir:\n"
+"###     path: /extra\n"
+"###     source: /home/user\n"
+"###     type: disk\n"
+"### ephemeral: false\n"
+"###\n"
+"### Nazwa jest widoczna, ale nie może zostać zmieniona"
 
 #: lxc/network.go:555
 msgid ""
@@ -209,7 +228,7 @@ msgstr ""
 "###\n"
 "### Nazwa jest widoczna, ale nie może zostać zmieniona"
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -238,38 +257,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -298,7 +314,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -326,10 +342,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -357,22 +373,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -380,11 +396,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -392,14 +408,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -408,7 +424,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -448,19 +464,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -472,20 +488,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -498,7 +514,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -508,7 +524,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -558,12 +574,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -583,7 +599,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -617,7 +633,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -625,7 +641,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -639,32 +655,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -677,6 +680,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -689,15 +696,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -720,12 +726,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -733,16 +739,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -750,29 +760,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -790,14 +800,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/init.go:57
-msgid "Create virtual machine"
-msgstr ""
-
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -811,7 +817,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -829,7 +835,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -845,16 +851,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -865,6 +863,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -906,7 +912,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -938,7 +944,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -946,7 +952,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -973,7 +979,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -998,20 +1004,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -1023,7 +1029,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1042,24 +1048,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1088,14 +1094,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1111,7 +1117,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1124,19 +1130,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1163,11 +1169,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1234,11 +1240,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1253,12 +1259,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1277,26 +1283,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1313,11 +1319,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1348,7 +1354,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1356,12 +1362,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1393,11 +1399,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1431,11 +1437,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1449,12 +1451,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1462,11 +1468,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1535,11 +1550,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1574,12 +1589,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1608,48 +1623,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1667,12 +1724,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1687,48 +1744,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1753,12 +1768,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1771,7 +1786,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1798,7 +1813,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1809,24 +1824,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1841,8 +1840,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1856,6 +1855,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1888,7 +1903,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1903,19 +1918,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1934,12 +1949,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1989,12 +2001,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -2020,22 +2032,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -2046,7 +2057,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2055,11 +2066,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2068,30 +2079,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2120,7 +2131,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2157,13 +2168,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2195,7 +2206,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2220,15 +2231,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2238,24 +2249,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2285,7 +2296,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2295,7 +2306,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2331,11 +2342,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2351,7 +2362,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2385,16 +2396,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2403,7 +2414,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2415,7 +2426,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2430,7 +2441,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2467,12 +2478,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2491,11 +2502,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2516,7 +2527,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2548,7 +2559,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2557,38 +2568,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2597,7 +2608,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2612,7 +2623,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2658,21 +2669,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2680,16 +2691,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2781,20 +2792,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2806,13 +2805,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2845,10 +2856,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2858,6 +2865,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2882,7 +2893,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2891,18 +2902,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2910,7 +2921,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2923,26 +2934,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2983,24 +2994,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -3021,11 +3032,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -3037,27 +3044,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3075,7 +3082,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3094,7 +3101,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3103,12 +3110,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3116,7 +3123,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3128,20 +3135,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3158,14 +3165,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3173,12 +3180,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3196,7 +3203,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3217,15 +3224,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3248,6 +3255,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3258,7 +3270,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3276,27 +3288,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3317,12 +3329,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3339,11 +3351,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3355,11 +3367,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3371,16 +3383,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3403,7 +3415,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3427,7 +3439,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3462,24 +3474,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3509,11 +3521,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3521,7 +3533,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3536,20 +3548,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3573,7 +3585,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3590,30 +3602,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3637,7 +3648,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3674,8 +3685,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3704,11 +3715,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3739,21 +3750,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3765,20 +3776,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3793,13 +3804,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3810,7 +3821,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3818,17 +3829,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3849,15 +3860,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3883,7 +3894,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3900,8 +3911,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3960,8 +3971,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3985,11 +3995,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -4006,19 +4016,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -4047,11 +4056,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4071,7 +4080,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4097,11 +4106,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4109,7 +4118,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4133,27 +4142,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4185,11 +4194,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4201,19 +4210,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4228,7 +4237,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4250,7 +4259,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4274,7 +4283,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c868930507..d19cf7529f 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\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/"
@@ -76,12 +76,13 @@ msgstr ""
 "###   size: \"61203283968\""
 
 #: lxc/config.go:103
+#, fuzzy
 msgid ""
 "### This is a yaml representation of the configuration.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -113,9 +114,26 @@ msgstr ""
 "###\n"
 "### Observe que o nome é exibido mas não pode ser modificado"
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+"# # # Esta é uma representação de yaml das propriedades de imagem.\n"
+"# # # Qualquer linha começando com um '#' será ignorada.\n"
+"# # # \n"
+"# # # Cada propriedade é representada por uma única linha:\n"
+"# # # um exemplo seria:\n"
+"# # # Descrição: Minha imagem personalizada"
+
 #: lxc/config_metadata.go:62
+#, fuzzy
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -157,22 +175,6 @@ msgstr ""
 "###     template: template.tpl\n"
 "###     properties: {}"
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-"# # # Esta é uma representação de yaml das propriedades de imagem.\n"
-"# # # Qualquer linha começando com um '#' será ignorada.\n"
-"# # # \n"
-"# # # Cada propriedade é representada por uma única linha:\n"
-"# # # um exemplo seria:\n"
-"# # # Descrição: Minha imagem personalizada"
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -279,7 +281,7 @@ msgstr ""
 "###   source: /home/chb/mnt/lxd_test/default.img\n"
 "###   zfs.pool_name: default"
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -308,40 +310,38 @@ msgstr "'%s' não é um tipo de arquivo suportado"
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr "--container-only não pode ser passado quando a fonte é um snapshot"
-
 #: lxc/init.go:122
 #, fuzzy
 msgid "--empty cannot be combined with an image name"
 msgstr "--refresh só pode ser usado com containers"
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
-msgstr "--refresh só pode ser usado com containers"
+#: lxc/copy.go:153
+#, fuzzy
+msgid "--instance-only can't be passed when the source is a snapshot"
+msgstr "--container-only não pode ser passado quando a fonte é um snapshot"
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/copy.go:164
 #, fuzzy
-msgid "--target cannot be used with containers"
+msgid "--refresh can only be used with instances"
 msgstr "--refresh só pode ser usado com containers"
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 #, fuzzy
 msgid "--target cannot be used with instances"
 msgstr "--refresh só pode ser usado com containers"
@@ -371,7 +371,8 @@ msgid "Action (defaults to GET)"
 msgstr "Ação (padrão para o GET)"
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+#, fuzzy
+msgid "Add devices to instances or profiles"
 msgstr "Adicionar dispositivos aos containers ou perfis"
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -399,10 +400,11 @@ msgid "Add new trusted clients"
 msgstr "Adicionar novos clientes confiáveis"
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+#, fuzzy
+msgid "Add profiles to instances"
 msgstr "Adicionar perfis aos containers"
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -430,22 +432,24 @@ msgstr "Nome do alias ausente"
 msgid "Aliases:"
 msgstr "Aliases:"
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr "Arquitetura: %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr "Arquitetura: %v"
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+#, fuzzy
+msgid "Assign sets of profiles to instances"
 msgstr "Atribuir conjuntos de perfis aos containers"
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+#, fuzzy
+msgid "Attach network interfaces to instances"
 msgstr "Anexar interfaces de rede aos containers"
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -453,26 +457,29 @@ msgid "Attach network interfaces to profiles"
 msgstr "Anexar interfaces de rede aos perfis"
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+#, fuzzy
+msgid "Attach new network interfaces to instances"
 msgstr "Anexar uma nova interface de rede aos containers"
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
-msgstr ""
+#, fuzzy
+msgid "Attach new storage volumes to instances"
+msgstr "Desconectar volumes de armazenamento dos containers"
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
 msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
-msgstr ""
+#, fuzzy
+msgid "Attach to instance consoles"
+msgstr "Anexar interfaces de rede aos perfis"
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -481,7 +488,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr "Tipo de autenticação '%s' não suportada pelo servidor"
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -521,19 +528,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr "Erro de sintaxe, esperado <dispositivo>,<chave>=<valor>: %s"
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr "Marca: %v"
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr "Bytes recebido"
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr "Bytes enviado"
 
@@ -545,20 +552,20 @@ msgstr "CANCELÁVEL"
 msgid "COMMON NAME"
 msgstr "NOME COMUM"
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, fuzzy, c-format
 msgid "CPU (%s):"
 msgstr "Utilização do CPU:"
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr "Utilização do CPU (em segundos)"
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr "Utilização do CPU:"
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, fuzzy, c-format
 msgid "CPUs (%s):"
 msgstr "CPUs:"
@@ -571,7 +578,7 @@ msgstr "CRIADO"
 msgid "CREATED AT"
 msgstr "CRIADO EM"
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr "Versão CUDA: %v"
@@ -581,7 +588,7 @@ msgstr "Versão CUDA: %v"
 msgid "Cached: %s"
 msgstr "Em cache: %s"
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 #, fuzzy
 msgid "Caches:"
 msgstr "Em cache: %s"
@@ -632,12 +639,12 @@ msgstr "Não é possível remover chave '%s', não está atualmente definido"
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr "Cartão %d:"
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, fuzzy, c-format
 msgid "Card: %s (%s)"
 msgstr "Em cache: %s"
@@ -658,7 +665,7 @@ msgid "Client version: %s\n"
 msgstr "Versão do cliente: %s\n"
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -697,7 +704,8 @@ msgstr ""
 "Para obter ajuda com qualquer um desses, simplesmente use-os com --help."
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+#, fuzzy
+msgid "Config key/value to apply to the new instance"
 msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 
 #: lxc/project.go:88
@@ -705,8 +713,9 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
-msgstr ""
+#, fuzzy
+msgid "Config key/value to apply to the target instance"
+msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
@@ -719,32 +728,19 @@ msgstr "Erro de análise de configuração: %s"
 msgid "Console log:"
 msgstr "Log de Console:"
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "Aliases de cópia da fonte"
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr "Copiar imagens entre servidores"
@@ -757,6 +753,11 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+#, fuzzy
+msgid "Copy instances within or in between LXD servers"
+msgstr "Copiar imagens entre servidores"
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -769,15 +770,14 @@ msgstr "Copiar perfis"
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -801,12 +801,12 @@ msgstr "Copiar a imagem: %s"
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -814,16 +814,22 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr "Impossível criar diretório para certificado do servidor"
 
+#: lxc/init.go:57
+#, fuzzy
+msgid "Create a virtual machine"
+msgstr "Copiar a imagem: %s"
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
-msgstr ""
+#, fuzzy
+msgid "Create an empty instance"
+msgstr "Criando %s"
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -831,14 +837,16 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
-msgstr ""
+#, fuzzy
+msgid "Create instance snapshots"
+msgstr "Criando %s"
 
 #: lxc/snapshot.go:24
+#, fuzzy
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 "Criar image do container\n"
@@ -847,17 +855,19 @@ msgstr ""
 "do container, incluindo estado de memória dos processos, conexões TCP, ..."
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
-msgstr ""
+#, fuzzy
+msgid "Create instances from images"
+msgstr "Criando %s"
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+#, fuzzy
+msgid "Create new instance file templates"
+msgstr "Editar templates de arquivo do container"
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr "Criar novas redes"
@@ -875,15 +885,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/init.go:57
-#, fuzzy
-msgid "Create virtual machine"
-msgstr "Copiar a imagem: %s"
-
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr "Criado: %s"
@@ -898,7 +903,7 @@ msgstr "Criando %s"
 msgid "Creating the instance"
 msgstr "Criando %s"
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -916,7 +921,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -933,17 +938,10 @@ msgstr "Definir um algoritmo de compressão: para imagem ou nenhum"
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
-msgstr ""
+#, fuzzy
+msgid "Delete files in instances"
+msgstr "Editar arquivos no container"
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
 msgid "Delete image aliases"
@@ -953,6 +951,16 @@ msgstr "Apagar nomes alternativos da imagem"
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+#, fuzzy
+msgid "Delete instance file templates"
+msgstr "Editar templates de arquivo do container"
+
+#: lxc/delete.go:29 lxc/delete.go:30
+#, fuzzy
+msgid "Delete instances and snapshots"
+msgstr "Apagar nomes alternativos da imagem"
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -994,7 +1002,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -1026,7 +1034,8 @@ msgid "Description"
 msgstr "Descrição"
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+#, fuzzy
+msgid "Detach network interfaces from instances"
 msgstr "Desconectar interfaces de rede dos containers"
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -1034,7 +1043,8 @@ msgid "Detach network interfaces from profiles"
 msgstr "Desconectar interfaces de rede dos perfis"
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+#, fuzzy
+msgid "Detach storage volumes from instances"
 msgstr "Desconectar volumes de armazenamento dos containers"
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -1061,7 +1071,7 @@ msgstr "Dispositivo %s removido de %s"
 msgid "Device already exists: %s"
 msgstr "O dispositivo já existe: %s"
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, fuzzy, c-format
 msgid "Device: %s"
 msgstr "Em cache: %s"
@@ -1086,21 +1096,21 @@ msgstr "Desabilitar alocação de pseudo-terminal"
 msgid "Disable stdin (reads from /dev/null)"
 msgstr "Desabilitar stdin (ler de /dev/null)"
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, fuzzy, c-format
 msgid "Disk %d:"
 msgstr "Uso de disco:"
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr "Uso de disco:"
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 #, fuzzy
 msgid "Disk:"
 msgstr "Uso de disco:"
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 #, fuzzy
 msgid "Disks:"
 msgstr "Uso de disco:"
@@ -1113,7 +1123,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1132,26 +1142,30 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/file.go:153 lxc/file.go:154
+#, fuzzy
+msgid "Edit files in instances"
+msgstr "Editar arquivos no container"
+
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
+msgstr "Editar propriedades da imagem"
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#, fuzzy
+msgid "Edit instance file templates"
 msgstr "Editar templates de arquivo do container"
 
 #: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#, fuzzy
+msgid "Edit instance metadata files"
 msgstr "Editar arquivos de metadados do container"
 
 #: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#, fuzzy
+msgid "Edit instance or server configurations as YAML"
 msgstr "Editar configurações do container ou do servidor como YAML"
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
-msgstr "Editar arquivos no container"
-
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
-msgstr "Editar propriedades da imagem"
-
 #: lxc/network.go:545 lxc/network.go:546
 msgid "Edit network configurations as YAML"
 msgstr "Editar configurações de rede como YAML"
@@ -1179,14 +1193,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1202,7 +1216,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1215,19 +1229,19 @@ msgid "Event type to listen for"
 msgstr "Tipo de evento a escutar"
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1254,11 +1268,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1325,11 +1339,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1344,12 +1358,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1368,26 +1382,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1404,12 +1418,14 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Get values for instance device configuration keys"
+msgstr "Editar configurações de perfil como YAML"
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Get values for instance or server configuration keys"
+msgstr "Editar configurações de perfil como YAML"
 
 #: lxc/network.go:668 lxc/network.go:669
 msgid "Get values for network configuration keys"
@@ -1440,7 +1456,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr "HOSTNAME"
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1448,12 +1464,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1485,11 +1501,12 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+#, fuzzy
+msgid "Ignore the instance state"
 msgstr "Ignorar o estado do container"
 
 #: lxc/image.go:1326
@@ -1523,11 +1540,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1541,12 +1554,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/import.go:72
-#, c-format
-msgid "Importing container: %s"
+#: lxc/import.go:27
+msgid "Import instance backups"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/import.go:72
+#, fuzzy, c-format
+msgid "Importing instance: %s"
+msgstr "Criando %s"
+
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1554,11 +1571,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, fuzzy, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr "Certificado fingerprint: %s"
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1627,11 +1653,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, fuzzy, c-format
 msgid "IsSM: %s (%s)"
 msgstr "Em cache: %s"
@@ -1666,12 +1692,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, fuzzy, c-format
 msgid "Link detected: %v"
 msgstr "Arquitetura: %v"
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1700,48 +1726,92 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
-msgstr ""
+#, fuzzy
+msgid "List instance file templates"
+msgstr "Editar templates de arquivo do container"
 
 #: lxc/list.go:43
-msgid "List containers"
-msgstr ""
+#, fuzzy
+msgid "List instances"
+msgstr "Criando %s"
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1759,12 +1829,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1779,48 +1849,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1845,12 +1873,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1863,7 +1891,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, fuzzy, c-format
 msgid "MAD: %s (%s)"
 msgstr "Em cache: %s"
@@ -1890,7 +1918,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1901,25 +1929,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
-msgstr ""
+#, fuzzy
+msgid "Manage files in instances"
+msgstr "Editar arquivos no container"
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
 msgid "Manage image aliases"
@@ -1933,8 +1946,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1948,6 +1961,25 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+#, fuzzy
+msgid "Manage instance and server configuration options"
+msgstr "Editar configurações do container ou do servidor como YAML"
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+#, fuzzy
+msgid "Manage instance file templates"
+msgstr "Editar templates de arquivo do container"
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#, fuzzy
+msgid "Manage instance metadata files"
+msgstr "Editar arquivos de metadados do container"
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1980,7 +2012,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1995,19 +2027,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -2026,12 +2058,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -2081,12 +2110,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -2112,22 +2141,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -2138,7 +2166,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2147,11 +2175,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2160,30 +2188,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2212,7 +2240,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2249,13 +2277,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2287,7 +2315,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2312,15 +2340,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2330,24 +2358,25 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
-msgstr ""
+#, fuzzy
+msgid "Pause instances"
+msgstr "Criando %s"
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2377,7 +2406,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2387,7 +2416,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2423,12 +2452,14 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
-msgstr ""
+#, fuzzy
+msgid "Profile to apply to the new instance"
+msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
-msgstr ""
+#, fuzzy
+msgid "Profile to apply to the target instance"
+msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 
 #: lxc/profile.go:227
 #, c-format
@@ -2445,7 +2476,7 @@ msgstr "Copiar perfis"
 msgid "Profiles: "
 msgstr "Copiar perfis"
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2479,16 +2510,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, fuzzy, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr "Editar arquivos no container"
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2497,8 +2528,9 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
-msgstr ""
+#, fuzzy
+msgid "Push files into instances"
+msgstr "Editar arquivos no container"
 
 #: lxc/file.go:623 lxc/file.go:779
 #, c-format
@@ -2509,7 +2541,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2524,7 +2556,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, fuzzy, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr "Editar arquivos no container"
 
 #: lxc/image.go:1294
@@ -2561,12 +2593,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2585,12 +2617,13 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
-msgstr ""
+#, fuzzy
+msgid "Remove profiles from instances"
+msgstr "Adicionar perfis aos containers"
 
 #: lxc/remote.go:596 lxc/remote.go:597
 msgid "Remove remotes"
@@ -2610,7 +2643,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2642,7 +2675,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2651,38 +2684,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2691,7 +2724,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2706,7 +2739,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2752,21 +2785,22 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Set instance device configuration keys"
+msgstr "Editar configurações de perfil como YAML"
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2774,16 +2808,17 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Set instance or server configuration keys"
+msgstr "Editar configurações do container ou do servidor como YAML"
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2876,21 +2911,10 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
-msgstr ""
+#, fuzzy
+msgid "Show content of instance file templates"
+msgstr "Editar templates de arquivo do container"
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
 msgid "Show details of a cluster member"
@@ -2901,13 +2925,29 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
-msgstr ""
+#, fuzzy
+msgid "Show full device configuration for instances or profiles"
+msgstr "Adicionar dispositivos aos containers ou perfis"
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#, fuzzy
+msgid "Show instance metadata files"
+msgstr "Editar arquivos de metadados do container"
+
+#: lxc/config.go:579 lxc/config.go:580
+#, fuzzy
+msgid "Show instance or server configurations"
+msgstr "Editar configurações do container ou do servidor como YAML"
+
+#: lxc/info.go:32 lxc/info.go:33
+#, fuzzy
+msgid "Show instance or server information"
+msgstr "Editar configurações do container ou do servidor como YAML"
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2940,10 +2980,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2953,6 +2989,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2977,7 +3017,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2986,27 +3026,28 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
-#, c-format
-msgid "Some containers failed to %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Some instances failed to %s"
+msgstr "Dispositivo %s adicionado a %s"
 
 #: lxc/image.go:936
 msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
-msgstr ""
+#, fuzzy
+msgid "Start instances"
+msgstr "Criando %s"
 
 #: lxc/launch.go:68
 #, c-format
@@ -3018,27 +3059,27 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
-#, c-format
-msgid "Stopping the container failed: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Stopping the instance failed: %s"
+msgstr "Criando %s"
 
 #: lxc/storage.go:145
 #, c-format
@@ -3078,24 +3119,25 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
-msgstr ""
+#, fuzzy
+msgid "Store the instance state"
+msgstr "Ignorar o estado do container"
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -3116,11 +3158,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -3132,27 +3170,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3170,7 +3208,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3189,7 +3227,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3198,12 +3236,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3211,7 +3249,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3223,20 +3261,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3253,27 +3291,27 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
-#, c-format
-msgid "Transferring container: %s"
-msgstr ""
-
 #: lxc/image.go:725
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
+#: lxc/copy.go:354
+#, fuzzy, c-format
+msgid "Transferring instance: %s"
+msgstr "Editar arquivos no container"
+
 #: lxc/action.go:196 lxc/launch.go:99
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3291,7 +3329,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3312,16 +3350,19 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
-msgstr ""
+#, fuzzy
+msgid "Unset all profiles on the target instance"
+msgstr "Não pode fornecer um nome para a imagem de destino"
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Unset instance device configuration keys"
+msgstr "Editar configurações de perfil como YAML"
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
-msgstr ""
+#, fuzzy
+msgid "Unset instance or server configuration keys"
+msgstr "Editar configurações do container ou do servidor como YAML"
 
 #: lxc/network.go:1142 lxc/network.go:1143
 msgid "Unset network configuration keys"
@@ -3344,6 +3385,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3354,7 +3400,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3372,27 +3418,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, fuzzy, c-format
 msgid "Verb: %s (%s)"
 msgstr "Em cache: %s"
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3413,12 +3459,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3435,11 +3481,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3451,11 +3497,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3467,16 +3513,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3499,7 +3545,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3523,7 +3569,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3558,24 +3604,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3605,11 +3651,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3617,7 +3663,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3632,20 +3678,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3669,7 +3715,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3686,30 +3732,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3733,7 +3778,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3770,8 +3815,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3800,11 +3845,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3835,21 +3880,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3861,20 +3906,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3889,13 +3934,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3906,7 +3951,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3914,17 +3959,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3945,15 +3990,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3979,7 +4024,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3996,8 +4041,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -4056,8 +4101,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -4081,11 +4125,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -4102,19 +4146,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -4143,11 +4186,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4167,7 +4210,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4193,11 +4236,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4205,7 +4248,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4229,27 +4272,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4281,11 +4324,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4297,19 +4340,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4324,7 +4367,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4346,7 +4389,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4370,7 +4413,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
@@ -4394,6 +4437,10 @@ msgstr ""
 msgid "yes"
 msgstr "sim"
 
+#, fuzzy
+#~ msgid "--target cannot be used with containers"
+#~ msgstr "--refresh só pode ser usado com containers"
+
 #~ msgid "ARCH"
 #~ msgstr "ARQUITETURA"
 
diff --git a/po/ru.po b/po/ru.po
index 4809821f03..194275eda8 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: 2018-06-22 15:57+0000\n"
 "Last-Translator: Александр Киль <shorrey at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -66,12 +66,13 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:103
+#, fuzzy
 msgid ""
 "### This is a yaml representation of the configuration.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -103,10 +104,26 @@ msgstr ""
 "###\n"
 "### Обратите внимание, что имя отображается, но не может быть изменено"
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+"### Это представление свойств образа в формате YAML.\n"
+"### Любая строка начинающаяся с '#' будет игнорироваться.\n"
+"###\n"
+"### Каждое свойство представлено одной строкой.\n"
+"### Например:\n"
+"###  description: My custom image"
+
 #: lxc/config_metadata.go:62
 #, fuzzy
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -145,22 +162,6 @@ msgstr ""
 "###\n"
 "### Обратите внимание, что имя отображается, но не может быть изменено"
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-"### Это представление свойств образа в формате YAML.\n"
-"### Любая строка начинающаяся с '#' будет игнорироваться.\n"
-"###\n"
-"### Каждое свойство представлено одной строкой.\n"
-"### Например:\n"
-"###  description: My custom image"
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -270,7 +271,7 @@ msgstr ""
 "###\n"
 "### Обратите внимание, что имя отображается, но не может быть изменено"
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -299,38 +300,35 @@ msgstr ""
 msgid "(none)"
 msgstr "(пусто)"
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -360,7 +358,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -389,10 +387,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -420,22 +418,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr "Псевдонимы:"
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr "Архитектура: %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, fuzzy, c-format
 msgid "Architecture: %v"
 msgstr "Архитектура: %s"
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -443,26 +441,27 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
-msgstr ""
+#, fuzzy
+msgid "Attach new storage volumes to instances"
+msgstr "Копирование образа: %s"
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
 msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -471,7 +470,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -511,19 +510,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr "Получено байтов"
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr "Отправлено байтов"
 
@@ -535,21 +534,21 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr "ОБЩЕЕ ИМЯ"
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, fuzzy, c-format
 msgid "CPU (%s):"
 msgstr " Использование ЦП:"
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr "Использование ЦП (в секундах)"
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 #, fuzzy
 msgid "CPU usage:"
 msgstr " Использование ЦП:"
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -563,7 +562,7 @@ msgstr "СОЗДАН"
 msgid "CREATED AT"
 msgstr "СОЗДАН"
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -573,7 +572,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -623,12 +622,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -649,7 +648,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -683,7 +682,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -691,7 +690,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -705,32 +704,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr "Имя контейнера является обязательным"
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "Копировать псевдонимы из источника"
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -743,6 +729,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -756,15 +746,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr "Копирование образа: %s"
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -788,12 +777,12 @@ msgstr "Копирование образа: %s"
 msgid "Copying the storage volume: %s"
 msgstr "Копирование образа: %s"
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -801,17 +790,22 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr "Не удалось создать каталог сертификата сервера"
 
+#: lxc/init.go:57
+#, fuzzy
+msgid "Create a virtual machine"
+msgstr "Копирование образа: %s"
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
 #, fuzzy
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -820,24 +814,20 @@ msgstr ""
 
 #: lxc/snapshot.go:23
 #, fuzzy
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
 #, fuzzy
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
@@ -845,6 +835,11 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Create new custom storage volumes"
 msgstr "Копирование образа: %s"
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+#, fuzzy
+msgid "Create new instance file templates"
+msgstr "Невозможно добавить имя контейнера в список"
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -864,15 +859,10 @@ msgstr "Копирование образа: %s"
 
 #: lxc/copy.go:56 lxc/init.go:55
 #, fuzzy
-msgid "Create the container with no profiles applied"
+msgid "Create the instance with no profiles applied"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/init.go:57
-#, fuzzy
-msgid "Create virtual machine"
-msgstr "Копирование образа: %s"
-
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -887,7 +877,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -905,7 +895,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -921,20 +911,11 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-#, fuzzy
-msgid "Delete container file templates"
-msgstr "Невозможно добавить имя контейнера в список"
-
-#: lxc/delete.go:29 lxc/delete.go:30
+#: lxc/file.go:104 lxc/file.go:105
 #, fuzzy
-msgid "Delete containers and snapshots"
+msgid "Delete files in instances"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
-msgstr ""
-
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
 msgid "Delete image aliases"
 msgstr ""
@@ -943,6 +924,16 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+#, fuzzy
+msgid "Delete instance file templates"
+msgstr "Невозможно добавить имя контейнера в список"
+
+#: lxc/delete.go:29 lxc/delete.go:30
+#, fuzzy
+msgid "Delete instances and snapshots"
+msgstr "Невозможно добавить имя контейнера в список"
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -985,7 +976,7 @@ msgstr "Копирование образа: %s"
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -1017,7 +1008,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -1025,8 +1016,9 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
-msgstr ""
+#, fuzzy
+msgid "Detach storage volumes from instances"
+msgstr "Копирование образа: %s"
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
 msgid "Detach storage volumes from profiles"
@@ -1052,7 +1044,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -1077,22 +1069,22 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, fuzzy, c-format
 msgid "Disk %d:"
 msgstr " Использование диска:"
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 #, fuzzy
 msgid "Disk usage:"
 msgstr " Использование диска:"
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 #, fuzzy
 msgid "Disk:"
 msgstr " Использование диска:"
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 #, fuzzy
 msgid "Disks:"
 msgstr " Использование диска:"
@@ -1105,7 +1097,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -1124,25 +1116,26 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
+msgstr ""
+
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 #, fuzzy
-msgid "Edit container file templates"
+msgid "Edit instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
-msgstr ""
+#, fuzzy
+msgid "Edit instance metadata files"
+msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
-msgstr ""
-
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
-msgstr ""
-
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1171,14 +1164,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1194,7 +1187,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1207,19 +1200,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1248,12 +1241,12 @@ msgstr ""
 
 #: lxc/export.go:32
 #, fuzzy
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/export.go:33
 #, fuzzy
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/export.go:120
@@ -1320,11 +1313,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1339,12 +1332,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1363,26 +1356,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1399,11 +1392,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1434,7 +1427,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1442,12 +1435,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1479,12 +1472,12 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
 #, fuzzy
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/image.go:1326
@@ -1518,14 +1511,9 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
-#: lxc/import.go:27
-#, fuzzy
-msgid "Import container backups"
-msgstr "Невозможно добавить имя контейнера в список"
-
 #: lxc/image.go:605
 msgid ""
 "Import image into the image store\n"
@@ -1538,12 +1526,17 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr "Копирование образа: %s"
 
+#: lxc/import.go:27
+#, fuzzy
+msgid "Import instance backups"
+msgstr "Невозможно добавить имя контейнера в список"
+
 #: lxc/import.go:72
 #, fuzzy, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1551,11 +1544,21 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+#, fuzzy
+msgid "Instance name is mandatory"
+msgstr "Имя контейнера является обязательным"
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Имя контейнера: %s"
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1624,11 +1627,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1663,12 +1666,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, fuzzy, c-format
 msgid "Link detected: %v"
 msgstr "Архитектура: %s"
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1698,49 +1701,93 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
+#: lxc/config_device.go:260 lxc/config_device.go:261
+#, fuzzy
+msgid "List instance devices"
+msgstr "Копирование образа: %s"
+
 #: lxc/config_template.go:236 lxc/config_template.go:237
 #, fuzzy
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/list.go:43
-msgid "List containers"
-msgstr ""
+#, fuzzy
+msgid "List instances"
+msgstr "Псевдонимы:"
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1758,12 +1805,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1778,48 +1825,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1845,12 +1850,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1863,7 +1868,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1890,7 +1895,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1901,27 +1906,11 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
-msgid "Manage container file templates"
+msgid "Manage files in instances"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
-#: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
-msgstr ""
-
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
 msgid "Manage image aliases"
 msgstr ""
@@ -1934,8 +1923,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1949,6 +1938,25 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage instance devices"
+msgstr "Копирование образа: %s"
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+#, fuzzy
+msgid "Manage instance file templates"
+msgstr "Невозможно добавить имя контейнера в список"
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#, fuzzy
+msgid "Manage instance metadata files"
+msgstr "Невозможно добавить имя контейнера в список"
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1983,7 +1991,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1998,20 +2006,20 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 #, fuzzy
 msgid "Memory usage:"
 msgstr " Использование памяти:"
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 #, fuzzy
 msgid "Memory:"
 msgstr " Использование памяти:"
@@ -2031,15 +2039,12 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
 #, fuzzy
-msgid "Missing container name"
+msgid "Missing instance name"
 msgstr "Имя контейнера: %s"
 
-#: lxc/profile.go:125
-msgid "Missing container.name name"
-msgstr ""
-
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
 #: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
 #: lxc/config_device.go:637
@@ -2089,12 +2094,12 @@ msgstr "Копирование образа: %s"
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -2120,7 +2125,7 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
@@ -2128,15 +2133,14 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr "Копирование образа: %s"
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, fuzzy, c-format
 msgid "Moving the storage volume: %s"
@@ -2147,7 +2151,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2156,11 +2160,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2169,30 +2173,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2221,7 +2225,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 #, fuzzy
 msgid "Network usage:"
 msgstr " Использование сети:"
@@ -2260,13 +2264,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2298,7 +2302,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2323,15 +2327,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2341,24 +2345,25 @@ msgid "Password for %s: "
 msgstr "Пароль администратора для %s: "
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
-msgstr ""
+#, fuzzy
+msgid "Pause instances"
+msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, fuzzy, c-format
 msgid "Port type: %s"
 msgstr "Авто-обновление: %s"
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2388,7 +2393,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2398,7 +2403,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2434,11 +2439,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2454,7 +2459,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2488,16 +2493,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, fuzzy, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2506,7 +2511,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2518,7 +2523,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2534,7 +2539,7 @@ msgstr "Копирование образа: %s"
 
 #: lxc/copy.go:388
 #, fuzzy, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/image.go:1294
@@ -2571,12 +2576,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2596,11 +2601,11 @@ msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
 #, fuzzy
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2622,7 +2627,7 @@ msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
 #, fuzzy
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2656,7 +2661,7 @@ msgstr "Копирование образа: %s"
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2665,39 +2670,40 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+#, fuzzy
+msgid "Restore instances from snapshots"
+msgstr "Копирование образа: %s"
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 #, fuzzy
 msgid "Restore storage volume snapshots"
 msgstr "Копирование образа: %s"
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2706,7 +2712,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2721,7 +2727,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2767,21 +2773,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2789,16 +2795,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2890,22 +2896,9 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-#, fuzzy
-msgid "Show container metadata files"
-msgstr "Невозможно добавить имя контейнера в список"
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
 #, fuzzy
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2917,13 +2910,26 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#, fuzzy
+msgid "Show instance metadata files"
+msgstr "Невозможно добавить имя контейнера в список"
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2956,10 +2962,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2969,6 +2971,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2993,7 +2999,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, fuzzy, c-format
 msgid "Size: %s"
 msgstr "Авто-обновление: %s"
@@ -3003,18 +3009,18 @@ msgstr "Авто-обновление: %s"
 msgid "Snapshot storage volumes"
 msgstr "Копирование образа: %s"
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, fuzzy, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/image.go:936
@@ -3022,8 +3028,9 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
-msgstr ""
+#, fuzzy
+msgid "Start instances"
+msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/launch.go:68
 #, c-format
@@ -3035,27 +3042,28 @@ msgstr ""
 msgid "State: %s"
 msgstr "Авто-обновление: %s"
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
 #, fuzzy
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
-msgstr ""
+#, fuzzy
+msgid "Stopping instance failed!"
+msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/delete.go:120
 #, fuzzy, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
 #: lxc/storage.go:145
@@ -3097,24 +3105,24 @@ msgstr ""
 
 #: lxc/action.go:114
 #, fuzzy
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -3135,11 +3143,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -3151,27 +3155,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3189,7 +3193,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3208,7 +3212,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3217,12 +3221,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3230,7 +3234,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3242,20 +3246,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3272,27 +3276,27 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
-#, c-format
-msgid "Transferring container: %s"
-msgstr ""
-
 #: lxc/image.go:725
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
+#: lxc/copy.go:354
+#, fuzzy, c-format
+msgid "Transferring instance: %s"
+msgstr "Невозможно добавить имя контейнера в список"
+
 #: lxc/action.go:196 lxc/launch.go:99
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3310,7 +3314,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3331,15 +3335,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3362,6 +3366,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3372,7 +3381,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3390,27 +3399,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3431,12 +3440,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3453,11 +3462,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3469,12 +3478,20 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+#, fuzzy
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+#, fuzzy
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/remote.go:83
 msgid "add [<remote>] <IP|FQDN|URL>"
@@ -3486,17 +3503,21 @@ msgid "alias"
 msgstr "Псевдонимы:"
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+#, fuzzy
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage_volume.go:216
 msgid ""
@@ -3518,8 +3539,12 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+#, fuzzy
+msgid "console [<remote>:]<instance>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage_volume.go:298
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
@@ -3542,8 +3567,12 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+#, fuzzy
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/network.go:252
 msgid "create [<remote>:]<network> [key=value...]"
@@ -3577,31 +3606,35 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
-#: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+#: lxc/image.go:267
+#, fuzzy
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:102
+#: lxc/config_template.go:106
 #, fuzzy
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/delete.go:27
+#: lxc/file.go:102
 #, fuzzy
-msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
-"<snapshot>]...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:267
+#: lxc/delete.go:27
 #, fuzzy
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgid ""
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
+"<snapshot>]...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -3644,20 +3677,32 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+#, fuzzy
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+#, fuzzy
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage_volume.go:695
 msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+#, fuzzy
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config_device.go:22
 msgid "device"
@@ -3671,21 +3716,33 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+#, fuzzy
+msgid "edit [<remote>:]<instance>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+#, fuzzy
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+#, fuzzy
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/network.go:544
 msgid "edit [<remote>:]<network>"
@@ -3713,7 +3770,7 @@ msgstr ""
 
 #: lxc/config.go:88
 #, fuzzy
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -3733,35 +3790,38 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
+#: lxc/image.go:444
+msgid "export [<remote>:]<image> [<target>]"
+msgstr ""
+
 #: lxc/export.go:31
 #, fuzzy
 msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:444
-msgid "export [<remote>:]<image> [<target>]"
-msgstr ""
-
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+#, fuzzy
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/network.go:667
 msgid "get [<remote>:]<network> <key>"
@@ -3792,8 +3852,12 @@ msgstr ""
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+#, fuzzy
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/remote.go:417
 msgid "get-default"
@@ -3829,9 +3893,13 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+#, fuzzy
+msgid "info [<remote>:][<instance>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/init.go:38
 #, fuzzy
@@ -3863,12 +3931,20 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+#, fuzzy
+msgid "list [<remote>:]<instance>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+#, fuzzy
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage_volume.go:1066
 msgid "list [<remote>:]<pool>"
@@ -3898,21 +3974,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3924,20 +4000,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3952,13 +4028,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3969,7 +4045,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3977,17 +4053,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -4008,15 +4084,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -4042,7 +4118,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -4059,8 +4135,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -4120,8 +4196,7 @@ msgstr ""
 #: lxc/move.go:34
 #, fuzzy
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4148,12 +4223,16 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+#, fuzzy
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/action.go:48
 #, fuzzy
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4172,16 +4251,19 @@ msgid "project"
 msgstr ""
 
 #: lxc/publish.go:33
+#, fuzzy
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/file.go:215
 #, fuzzy
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4190,7 +4272,7 @@ msgstr ""
 #: lxc/file.go:405
 #, fuzzy
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
@@ -4226,12 +4308,20 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+#, fuzzy
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+#, fuzzy
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/cluster.go:243
 msgid "remove [<remote>:]<member>"
@@ -4251,7 +4341,7 @@ msgstr ""
 
 #: lxc/rename.go:19
 #, fuzzy
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4285,15 +4375,19 @@ msgstr ""
 
 #: lxc/action.go:68
 #, fuzzy
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+#, fuzzy
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage_volume.go:1561
 #, fuzzy
@@ -4305,7 +4399,7 @@ msgstr ""
 
 #: lxc/config_device.go:504
 #, fuzzy
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4349,7 +4443,7 @@ msgstr ""
 
 #: lxc/config.go:452
 #, fuzzy
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4359,21 +4453,33 @@ msgstr ""
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+#, fuzzy
+msgid "show [<remote>:]<instance>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+#, fuzzy
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+#, fuzzy
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/cluster.go:144
 msgid "show [<remote>:]<member>"
@@ -4409,15 +4515,19 @@ msgstr ""
 
 #: lxc/config.go:578
 #, fuzzy
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+#, fuzzy
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage_volume.go:1490
 #, fuzzy
@@ -4433,23 +4543,23 @@ msgstr ""
 
 #: lxc/action.go:29
 #, fuzzy
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
 #, fuzzy
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4467,7 +4577,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4489,8 +4599,12 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+#, fuzzy
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/network.go:1141
 msgid "unset [<remote>:]<network> <key>"
@@ -4517,8 +4631,12 @@ msgstr ""
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+#, fuzzy
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/storage.go:442
 msgid "used by"
diff --git a/po/sl.po b/po/sl.po
index 8b9b8c6075..5643e215cf 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/sr.po b/po/sr.po
index f91144573f..59de2bbcb0 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/sv.po b/po/sv.po
index c542ccd329..df89b8a3a4 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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/te.po b/po/te.po
index 73718a23bc..ecd5eb94be 100644
--- a/po/te.po
+++ b/po/te.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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/tr.po b/po/tr.po
index 210eee7697..8b003f5256 100644
--- a/po/tr.po
+++ b/po/tr.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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/uk.po b/po/uk.po
index 9b99366429..ef1919b413 100644
--- a/po/uk.po
+++ b/po/uk.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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -68,9 +68,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -92,16 +102,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -189,38 +189,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -249,7 +246,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -277,10 +274,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -308,22 +305,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -331,11 +328,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -343,14 +340,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -359,7 +356,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -399,19 +396,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -423,20 +420,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -449,7 +446,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -459,7 +456,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -509,12 +506,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -534,7 +531,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -568,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -576,7 +573,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -590,32 +587,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -628,6 +612,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -640,15 +628,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -671,12 +658,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -684,16 +671,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -701,29 +692,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -741,14 +732,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -762,7 +749,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -780,7 +767,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -796,16 +783,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -816,6 +795,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -857,7 +844,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -889,7 +876,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -897,7 +884,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -924,7 +911,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -949,20 +936,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -974,7 +961,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -993,24 +980,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1039,14 +1026,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1062,7 +1049,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1075,19 +1062,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1114,11 +1101,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1185,11 +1172,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1204,12 +1191,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1228,26 +1215,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1264,11 +1251,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1299,7 +1286,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1307,12 +1294,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1344,11 +1331,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1382,11 +1369,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1400,12 +1383,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1413,11 +1400,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1486,11 +1482,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1525,12 +1521,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1559,48 +1555,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1618,12 +1656,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1638,48 +1676,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1704,12 +1700,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1722,7 +1718,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1749,7 +1745,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1760,24 +1756,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1792,8 +1772,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1807,6 +1787,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1839,7 +1835,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1854,19 +1850,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1885,12 +1881,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1940,12 +1933,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1971,22 +1964,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -1997,7 +1989,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2006,11 +1998,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2019,30 +2011,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2071,7 +2063,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2108,13 +2100,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2146,7 +2138,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2171,15 +2163,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2189,24 +2181,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2236,7 +2228,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2246,7 +2238,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2282,11 +2274,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2302,7 +2294,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2336,16 +2328,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2354,7 +2346,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2366,7 +2358,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2381,7 +2373,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2418,12 +2410,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2442,11 +2434,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2467,7 +2459,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2508,38 +2500,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2548,7 +2540,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2563,7 +2555,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2609,21 +2601,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2631,16 +2623,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2732,20 +2724,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2757,13 +2737,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2796,10 +2788,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2809,6 +2797,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2833,7 +2825,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2842,18 +2834,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2861,7 +2853,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2874,26 +2866,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2934,24 +2926,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2972,11 +2964,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2988,27 +2976,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3026,7 +3014,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3045,7 +3033,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3054,12 +3042,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3067,7 +3055,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3079,20 +3067,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3109,14 +3097,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3124,12 +3112,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3147,7 +3135,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3168,15 +3156,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3199,6 +3187,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3209,7 +3202,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3227,27 +3220,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3268,12 +3261,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3290,11 +3283,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3306,11 +3299,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3322,16 +3315,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3354,7 +3347,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3378,7 +3371,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3413,24 +3406,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3460,11 +3453,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3472,7 +3465,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3487,20 +3480,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3524,7 +3517,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3541,30 +3534,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3588,7 +3580,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3625,8 +3617,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3655,11 +3647,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3690,21 +3682,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3716,20 +3708,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3744,13 +3736,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3761,7 +3753,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3769,17 +3761,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3800,15 +3792,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3834,7 +3826,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3851,8 +3843,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3911,8 +3903,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3936,11 +3927,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3957,19 +3948,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -3998,11 +3988,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4022,7 +4012,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4048,11 +4038,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4060,7 +4050,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4084,27 +4074,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4136,11 +4126,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4152,19 +4142,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4179,7 +4169,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4201,7 +4191,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4225,7 +4215,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index b3463fef61..b6c3aa5ad6 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.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: 2019-12-06 22:53-0500\n"
+"POT-Creation-Date: 2020-01-13 15:14-0500\n"
 "PO-Revision-Date: 2018-09-11 19:15+0000\n"
 "Last-Translator: 0x0916 <w at laoqinren.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -56,7 +56,7 @@ msgid ""
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
-"### name: container1\n"
+"### name: instance1\n"
 "### profiles:\n"
 "### - default\n"
 "### config:\n"
@@ -71,9 +71,19 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/image.go:336
+msgid ""
+"### This is a yaml representation of the image properties.\n"
+"### Any line starting with a '# will be ignored.\n"
+"###\n"
+"### Each property is represented by a single line:\n"
+"### An example would be:\n"
+"###  description: My custom image"
+msgstr ""
+
 #: lxc/config_metadata.go:62
 msgid ""
-"### This is a yaml representation of the container metadata.\n"
+"### This is a yaml representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
 "###\n"
 "### A sample configuration looks like:\n"
@@ -95,16 +105,6 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:336
-msgid ""
-"### This is a yaml representation of the image properties.\n"
-"### Any line starting with a '# will be ignored.\n"
-"###\n"
-"### Each property is represented by a single line:\n"
-"### An example would be:\n"
-"###  description: My custom image"
-msgstr ""
-
 #: lxc/network.go:555
 msgid ""
 "### This is a yaml representation of the network.\n"
@@ -163,7 +163,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/info.go:292
+#: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
 msgstr ""
@@ -192,38 +192,35 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/info.go:281
+#: lxc/info.go:282
 #, c-format
 msgid "- Level %d (type: %s): %s"
 msgstr ""
 
-#: lxc/info.go:260
+#: lxc/info.go:261
 #, c-format
 msgid "- Partition %d"
 msgstr ""
 
-#: lxc/info.go:170
+#: lxc/info.go:171
 #, c-format
 msgid "- Port %d (%s)"
 msgstr ""
 
-#: lxc/copy.go:153
-msgid "--container-only can't be passed when the source is a snapshot"
-msgstr ""
-
 #: lxc/init.go:122
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:164
-msgid "--refresh can only be used with containers"
+#: lxc/copy.go:153
+msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
-msgid "--target cannot be used with containers"
+#: lxc/copy.go:164
+msgid "--refresh can only be used with instances"
 msgstr ""
 
-#: lxc/info.go:423
+#: lxc/config.go:150 lxc/config.go:406 lxc/config.go:499 lxc/config.go:637
+#: lxc/info.go:424
 msgid "--target cannot be used with instances"
 msgstr ""
 
@@ -252,7 +249,7 @@ msgid "Action (defaults to GET)"
 msgstr ""
 
 #: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to containers or profiles"
+msgid "Add devices to instances or profiles"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -280,10 +277,10 @@ msgid "Add new trusted clients"
 msgstr ""
 
 #: lxc/profile.go:100 lxc/profile.go:101
-msgid "Add profiles to containers"
+msgid "Add profiles to instances"
 msgstr ""
 
-#: lxc/info.go:174
+#: lxc/info.go:175
 #, c-format
 msgid "Address: %s"
 msgstr ""
@@ -311,22 +308,22 @@ msgstr ""
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:894 lxc/info.go:446
+#: lxc/image.go:894 lxc/info.go:447
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:125
 #, c-format
 msgid "Architecture: %v"
 msgstr ""
 
 #: lxc/profile.go:163 lxc/profile.go:164
-msgid "Assign sets of profiles to containers"
+msgid "Assign sets of profiles to instances"
 msgstr ""
 
 #: lxc/network.go:107
-msgid "Attach network interfaces to containers"
+msgid "Attach network interfaces to instances"
 msgstr ""
 
 #: lxc/network.go:180 lxc/network.go:181
@@ -334,11 +331,11 @@ msgid "Attach network interfaces to profiles"
 msgstr ""
 
 #: lxc/network.go:108
-msgid "Attach new network interfaces to containers"
+msgid "Attach new network interfaces to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:138 lxc/storage_volume.go:139
-msgid "Attach new storage volumes to containers"
+msgid "Attach new storage volumes to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:217 lxc/storage_volume.go:218
@@ -346,14 +343,14 @@ msgid "Attach new storage volumes to profiles"
 msgstr ""
 
 #: lxc/console.go:31
-msgid "Attach to container consoles"
+msgid "Attach to instance consoles"
 msgstr ""
 
 #: lxc/console.go:32
 msgid ""
-"Attach to container consoles\n"
+"Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a container\n"
+"This command allows you to interact with the boot console of a instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -362,7 +359,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/info.go:193
+#: lxc/info.go:194
 #, c-format
 msgid "Auto negotiation: %v"
 msgstr ""
@@ -402,19 +399,19 @@ msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
 
 #: lxc/action.go:239
-msgid "Both --all and container name given"
+msgid "Both --all and instance name given"
 msgstr ""
 
-#: lxc/info.go:125
+#: lxc/info.go:126
 #, c-format
 msgid "Brand: %v"
 msgstr ""
 
-#: lxc/info.go:545 lxc/network.go:786
+#: lxc/info.go:546 lxc/network.go:786
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:546 lxc/network.go:787
+#: lxc/info.go:547 lxc/network.go:787
 msgid "Bytes sent"
 msgstr ""
 
@@ -426,20 +423,20 @@ msgstr ""
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:327
+#: lxc/info.go:328
 #, c-format
 msgid "CPU (%s):"
 msgstr ""
 
-#: lxc/info.go:509
+#: lxc/info.go:510
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:513
+#: lxc/info.go:514
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/info.go:330
+#: lxc/info.go:331
 #, c-format
 msgid "CPUs (%s):"
 msgstr ""
@@ -452,7 +449,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:128
 #, c-format
 msgid "CUDA Version: %v"
 msgstr ""
@@ -462,7 +459,7 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
-#: lxc/info.go:279
+#: lxc/info.go:280
 msgid "Caches:"
 msgstr ""
 
@@ -512,12 +509,12 @@ msgstr ""
 msgid "Candid domain to use"
 msgstr ""
 
-#: lxc/info.go:373 lxc/info.go:385
+#: lxc/info.go:374 lxc/info.go:386
 #, c-format
 msgid "Card %d:"
 msgstr ""
 
-#: lxc/info.go:110
+#: lxc/info.go:111
 #, c-format
 msgid "Card: %s (%s)"
 msgstr ""
@@ -537,7 +534,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:469 lxc/config.go:584
-#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:44 lxc/init.go:54
+#: lxc/config.go:702 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
 #: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
@@ -571,7 +568,7 @@ msgid ""
 msgstr ""
 
 #: lxc/copy.go:45 lxc/init.go:48
-msgid "Config key/value to apply to the new container"
+msgid "Config key/value to apply to the new instance"
 msgstr ""
 
 #: lxc/project.go:88
@@ -579,7 +576,7 @@ msgid "Config key/value to apply to the new project"
 msgstr ""
 
 #: lxc/move.go:50
-msgid "Config key/value to apply to the target container"
+msgid "Config key/value to apply to the target instance"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
@@ -593,32 +590,19 @@ msgstr ""
 msgid "Console log:"
 msgstr ""
 
-#: lxc/publish.go:80
-msgid "Container name is mandatory"
-msgstr ""
-
-#: lxc/publish.go:276
-#, c-format
-msgid "Container published with fingerprint: %s"
-msgstr ""
-
-#: lxc/info.go:114
+#: lxc/info.go:115
 #, c-format
 msgid "Control: %s (%s)"
 msgstr ""
 
 #: lxc/copy.go:52 lxc/move.go:57
-msgid "Copy a stateful container stateless"
+msgid "Copy a stateful instance stateless"
 msgstr ""
 
 #: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
-msgid "Copy containers within or in between LXD instances"
-msgstr ""
-
 #: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
@@ -631,6 +615,10 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
+#: lxc/copy.go:40 lxc/copy.go:41
+msgid "Copy instances within or in between LXD servers"
+msgstr ""
+
 #: lxc/config_device.go:326 lxc/config_device.go:327
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
@@ -643,15 +631,14 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid ""
-"Copy the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/copy.go:50
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
+#: lxc/copy.go:51
+msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:306
 msgid "Copy the volume without its snapshots"
 msgstr ""
@@ -674,12 +661,12 @@ msgstr ""
 msgid "Copying the storage volume: %s"
 msgstr ""
 
-#: lxc/info.go:287
+#: lxc/info.go:288
 #, c-format
 msgid "Core %d"
 msgstr ""
 
-#: lxc/info.go:285
+#: lxc/info.go:286
 msgid "Cores:"
 msgstr ""
 
@@ -687,16 +674,20 @@ msgstr ""
 msgid "Could not create server cert dir"
 msgstr ""
 
+#: lxc/init.go:57
+msgid "Create a virtual machine"
+msgstr ""
+
 #: lxc/image_alias.go:57 lxc/image_alias.go:58
 msgid "Create aliases for existing images"
 msgstr ""
 
 #: lxc/init.go:56
-msgid "Create an empty container"
+msgid "Create an empty instance"
 msgstr ""
 
 #: lxc/launch.go:22 lxc/launch.go:23
-msgid "Create and start containers from images"
+msgid "Create and start instances from images"
 msgstr ""
 
 #: lxc/file.go:223 lxc/file.go:414
@@ -704,29 +695,29 @@ msgid "Create any directories necessary"
 msgstr ""
 
 #: lxc/snapshot.go:23
-msgid "Create container snapshots"
+msgid "Create instance snapshots"
 msgstr ""
 
 #: lxc/snapshot.go:24
 msgid ""
-"Create container snapshots\n"
+"Create instance snapshots\n"
 "\n"
-"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"When --stateful is used, LXD attempts to checkpoint the instance's\n"
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
 #: lxc/init.go:39 lxc/init.go:40
-msgid "Create containers from images"
-msgstr ""
-
-#: lxc/config_template.go:65 lxc/config_template.go:66
-msgid "Create new container file templates"
+msgid "Create instances from images"
 msgstr ""
 
 #: lxc/storage_volume.go:461 lxc/storage_volume.go:462
 msgid "Create new custom storage volumes"
 msgstr ""
 
+#: lxc/config_template.go:65 lxc/config_template.go:66
+msgid "Create new instance file templates"
+msgstr ""
+
 #: lxc/network.go:253 lxc/network.go:254
 msgid "Create new networks"
 msgstr ""
@@ -744,14 +735,10 @@ msgid "Create storage pools"
 msgstr ""
 
 #: lxc/copy.go:56 lxc/init.go:55
-msgid "Create the container with no profiles applied"
-msgstr ""
-
-#: lxc/init.go:57
-msgid "Create virtual machine"
+msgid "Create the instance with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:901 lxc/info.go:448
+#: lxc/image.go:901 lxc/info.go:449
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -765,7 +752,7 @@ msgstr ""
 msgid "Creating the instance"
 msgstr ""
 
-#: lxc/info.go:134 lxc/info.go:219
+#: lxc/info.go:135 lxc/info.go:220
 #, c-format
 msgid "Current number of VFs: %d"
 msgstr ""
@@ -783,7 +770,7 @@ msgstr ""
 msgid "DRIVER"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:107
 msgid "DRM:"
 msgstr ""
 
@@ -799,16 +786,8 @@ msgstr ""
 msgid "Delete a background operation (will attempt to cancel)"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
-msgid "Delete container file templates"
-msgstr ""
-
-#: lxc/delete.go:29 lxc/delete.go:30
-msgid "Delete containers and snapshots"
-msgstr ""
-
 #: lxc/file.go:104 lxc/file.go:105
-msgid "Delete files in containers"
+msgid "Delete files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:104 lxc/image_alias.go:105
@@ -819,6 +798,14 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
+#: lxc/config_template.go:108 lxc/config_template.go:109
+msgid "Delete instance file templates"
+msgstr ""
+
+#: lxc/delete.go:29 lxc/delete.go:30
+msgid "Delete instances and snapshots"
+msgstr ""
+
 #: lxc/network.go:325 lxc/network.go:326
 msgid "Delete networks"
 msgstr ""
@@ -860,7 +847,7 @@ msgstr ""
 #: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
 #: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
 #: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
+#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
 #: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
 #: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
 #: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
@@ -892,7 +879,7 @@ msgid "Description"
 msgstr ""
 
 #: lxc/network.go:375 lxc/network.go:376
-msgid "Detach network interfaces from containers"
+msgid "Detach network interfaces from instances"
 msgstr ""
 
 #: lxc/network.go:460 lxc/network.go:461
@@ -900,7 +887,7 @@ msgid "Detach network interfaces from profiles"
 msgstr ""
 
 #: lxc/storage_volume.go:614 lxc/storage_volume.go:615
-msgid "Detach storage volumes from containers"
+msgid "Detach storage volumes from instances"
 msgstr ""
 
 #: lxc/storage_volume.go:696 lxc/storage_volume.go:697
@@ -927,7 +914,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/info.go:238 lxc/info.go:262
+#: lxc/info.go:239 lxc/info.go:263
 #, c-format
 msgid "Device: %s"
 msgstr ""
@@ -952,20 +939,20 @@ msgstr ""
 msgid "Disable stdin (reads from /dev/null)"
 msgstr ""
 
-#: lxc/info.go:397
+#: lxc/info.go:398
 #, c-format
 msgid "Disk %d:"
 msgstr ""
 
-#: lxc/info.go:502
+#: lxc/info.go:503
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/info.go:392
+#: lxc/info.go:393
 msgid "Disk:"
 msgstr ""
 
-#: lxc/info.go:395
+#: lxc/info.go:396
 msgid "Disks:"
 msgstr ""
 
@@ -977,7 +964,7 @@ msgstr ""
 msgid "Don't show progress information"
 msgstr ""
 
-#: lxc/info.go:102 lxc/info.go:164
+#: lxc/info.go:103 lxc/info.go:165
 #, c-format
 msgid "Driver: %v (%v)"
 msgstr ""
@@ -996,24 +983,24 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
-msgid "Edit container file templates"
+#: lxc/file.go:153 lxc/file.go:154
+msgid "Edit files in instances"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
-msgid "Edit container metadata files"
+#: lxc/image.go:320 lxc/image.go:321
+msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config.go:89 lxc/config.go:90
-msgid "Edit container or server configurations as YAML"
+#: lxc/config_template.go:150 lxc/config_template.go:151
+msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/file.go:153 lxc/file.go:154
-msgid "Edit files in containers"
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+msgid "Edit instance metadata files"
 msgstr ""
 
-#: lxc/image.go:320 lxc/image.go:321
-msgid "Edit image properties"
+#: lxc/config.go:89 lxc/config.go:90
+msgid "Edit instance or server configurations as YAML"
 msgstr ""
 
 #: lxc/network.go:545 lxc/network.go:546
@@ -1042,14 +1029,14 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
 #: lxc/cluster.go:330
-msgid "Enable clustering on a single non-clustered LXD instance"
+msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
 #: lxc/cluster.go:331
 msgid ""
-"Enable clustering on a single non-clustered LXD instance\n"
+"Enable clustering on a single non-clustered LXD server\n"
 "\n"
-"  This command turns a non-clustered LXD instance into the first member of a "
+"  This command turns a non-clustered LXD server into the first member of a "
 "new\n"
 "  LXD cluster, which will have the given name.\n"
 "\n"
@@ -1065,7 +1052,7 @@ msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
 #: lxc/copy.go:48 lxc/init.go:50
-msgid "Ephemeral container"
+msgid "Ephemeral instance"
 msgstr ""
 
 #: lxc/config_template.go:203
@@ -1078,19 +1065,19 @@ msgid "Event type to listen for"
 msgstr ""
 
 #: lxc/exec.go:40
-msgid "Execute commands in containers"
+msgid "Execute commands in instances"
 msgstr ""
 
 #: lxc/exec.go:41
 msgid ""
-"Execute commands in containers\n"
+"Execute commands in instances\n"
 "\n"
 "The command is executed directly using exec, so there is no shell and\n"
 "shell patterns (variables, file redirects, ...) won't be understood.\n"
 "If you need a shell environment you need to execute the shell\n"
 "executable, passing the shell commands as arguments, for example:\n"
 "\n"
-"  lxc exec <container> -- sh -c \"cd /tmp && pwd\"\n"
+"  lxc exec <instance> -- sh -c \"cd /tmp && pwd\"\n"
 "\n"
 "Mode defaults to non-interactive, interactive mode is selected if both stdin "
 "AND stdout are terminals (stderr is ignored)."
@@ -1117,11 +1104,11 @@ msgid ""
 msgstr ""
 
 #: lxc/export.go:32
-msgid "Export container backups"
+msgid "Export instance backups"
 msgstr ""
 
 #: lxc/export.go:33
-msgid "Export containers as backup tarballs."
+msgid "Export instances as backup tarballs."
 msgstr ""
 
 #: lxc/export.go:120
@@ -1188,11 +1175,11 @@ msgid "Force removing a member, even if degraded"
 msgstr ""
 
 #: lxc/action.go:120
-msgid "Force the container to shutdown"
+msgid "Force the instance to shutdown"
 msgstr ""
 
 #: lxc/delete.go:34
-msgid "Force the removal of running containers"
+msgid "Force the removal of running instances"
 msgstr ""
 
 #: lxc/main.go:62
@@ -1207,12 +1194,12 @@ msgid ""
 "\n"
 "The removed server will not be functional after this action and will require "
 "a\n"
-"full reset of LXD, losing any remaining container, image or storage volume\n"
+"full reset of LXD, losing any remaining instance, image or storage volume\n"
 "that the server may have held.\n"
 "\n"
 "When possible, a graceful removal should be preferred, this will require you "
 "to\n"
-"move any affected container, image or storage volume to another server prior "
+"move any affected instance, image or storage volume to another server prior "
 "to\n"
 "the server being cleanly removed from the cluster.\n"
 "\n"
@@ -1231,26 +1218,26 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/info.go:341 lxc/info.go:352 lxc/info.go:356 lxc/info.go:362
+#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
 #, c-format
 msgid "Free: %v"
 msgstr ""
 
-#: lxc/info.go:288 lxc/info.go:300
+#: lxc/info.go:289 lxc/info.go:301
 #, c-format
 msgid "Frequency: %vMhz"
 msgstr ""
 
-#: lxc/info.go:298
+#: lxc/info.go:299
 #, c-format
 msgid "Frequency: %vMhz (min: %vMhz, max: %vMhz)"
 msgstr ""
 
-#: lxc/info.go:368
+#: lxc/info.go:369
 msgid "GPU:"
 msgstr ""
 
-#: lxc/info.go:371
+#: lxc/info.go:372
 msgid "GPUs:"
 msgstr ""
 
@@ -1267,11 +1254,11 @@ msgid "Get runtime information on networks"
 msgstr ""
 
 #: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for container device configuration keys"
+msgid "Get values for instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:372 lxc/config.go:373
-msgid "Get values for container or server configuration keys"
+msgid "Get values for instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:668 lxc/network.go:669
@@ -1302,7 +1289,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: lxc/info.go:340 lxc/info.go:351
+#: lxc/info.go:341 lxc/info.go:352
 msgid "Hugepages:\n"
 msgstr ""
 
@@ -1310,12 +1297,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lxc/info.go:107
+#: lxc/info.go:108
 #, c-format
 msgid "ID: %d"
 msgstr ""
 
-#: lxc/info.go:171 lxc/info.go:237 lxc/info.go:261
+#: lxc/info.go:172 lxc/info.go:238 lxc/info.go:262
 #, c-format
 msgid "ID: %s"
 msgstr ""
@@ -1347,11 +1334,11 @@ msgid ""
 msgstr ""
 
 #: lxc/snapshot.go:35
-msgid "Ignore any configured auto-expiry for the container"
+msgid "Ignore any configured auto-expiry for the instance"
 msgstr ""
 
 #: lxc/action.go:116
-msgid "Ignore the container state"
+msgid "Ignore the instance state"
 msgstr ""
 
 #: lxc/image.go:1326
@@ -1385,11 +1372,7 @@ msgid "Image refreshed successfully!"
 msgstr ""
 
 #: lxc/import.go:28
-msgid "Import backups of containers including their snapshots."
-msgstr ""
-
-#: lxc/import.go:27
-msgid "Import container backups"
+msgid "Import backups of instances including their snapshots."
 msgstr ""
 
 #: lxc/image.go:605
@@ -1403,12 +1386,16 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
+#: lxc/import.go:27
+msgid "Import instance backups"
+msgstr ""
+
 #: lxc/import.go:72
 #, c-format
-msgid "Importing container: %s"
+msgid "Importing instance: %s"
 msgstr ""
 
-#: lxc/info.go:200
+#: lxc/info.go:201
 msgid "Infiniband:"
 msgstr ""
 
@@ -1416,11 +1403,20 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
+#: lxc/publish.go:80
+msgid "Instance name is mandatory"
+msgstr ""
+
 #: lxc/copy.go:427 lxc/init.go:337
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
 
+#: lxc/publish.go:276
+#, c-format
+msgid "Instance published with fingerprint: %s"
+msgstr ""
+
 #: lxc/init.go:53
 msgid "Instance type"
 msgstr ""
@@ -1489,11 +1485,11 @@ msgstr ""
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:483 lxc/network.go:778
+#: lxc/info.go:484 lxc/network.go:778
 msgid "Ips:"
 msgstr ""
 
-#: lxc/info.go:203
+#: lxc/info.go:204
 #, c-format
 msgid "IsSM: %s (%s)"
 msgstr ""
@@ -1528,12 +1524,12 @@ msgstr ""
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:195
 #, c-format
 msgid "Link detected: %v"
 msgstr ""
 
-#: lxc/info.go:196
+#: lxc/info.go:197
 #, c-format
 msgid "Link speed: %dMbit/s (%s duplex)"
 msgstr ""
@@ -1562,48 +1558,90 @@ msgstr ""
 msgid "List background operations"
 msgstr ""
 
+#: lxc/image_alias.go:149
+msgid "List image aliases"
+msgstr ""
+
+#: lxc/image_alias.go:150
+msgid ""
+"List image aliases\n"
+"\n"
+"Filters may be part of the image hash or part of the image alias name.\n"
+msgstr ""
+
+#: lxc/image.go:967
+msgid "List images"
+msgstr ""
+
+#: lxc/image.go:968
+msgid ""
+"List images\n"
+"\n"
+"Filters may be of the <key>=<value> form for property based filtering,\n"
+"or part of the image hash or part of the image alias name.\n"
+"\n"
+"The -c option takes a (optionally comma-separated) list of arguments\n"
+"that control which image attributes to output when displaying in table\n"
+"or csv format.\n"
+"\n"
+"Default column layout is: lfpdasu\n"
+"\n"
+"Column shorthand chars:\n"
+"\n"
+"    l - Shortest image alias (and optionally number of other aliases)\n"
+"    L - Newline-separated list of all image aliases\n"
+"    f - Fingerprint (short)\n"
+"    F - Fingerprint (long)\n"
+"    p - Whether image is public\n"
+"    d - Description\n"
+"    a - Architecture\n"
+"    s - Size\n"
+"    u - Upload date\n"
+"    t - Type"
+msgstr ""
+
 #: lxc/config_device.go:260 lxc/config_device.go:261
-msgid "List container devices"
+msgid "List instance devices"
 msgstr ""
 
 #: lxc/config_template.go:236 lxc/config_template.go:237
-msgid "List container file templates"
+msgid "List instance file templates"
 msgstr ""
 
 #: lxc/list.go:43
-msgid "List containers"
+msgid "List instances"
 msgstr ""
 
 #: lxc/list.go:44
 msgid ""
-"List containers\n"
+"List instances\n"
 "\n"
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
 "== Filters ==\n"
-"A single keyword like \"web\" which will list any container with a name "
+"A single keyword like \"web\" which will list any instance with a name "
 "starting by \"web\".\n"
-"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"A regular expression on the instance name. (e.g. .*web.*01$).\n"
 "A key/value pair referring to a configuration item. For those, the\n"
 "namespace can be abbreviated to the smallest unambiguous identifier.\n"
 "\n"
 "Examples:\n"
-"  - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"  - \"user.blah=abc\" will list all instances with the \"blah\" user "
 "property set to \"abc\".\n"
 "  - \"u.blah=abc\" will do the same\n"
-"  - \"security.privileged=true\" will list all privileged containers\n"
+"  - \"security.privileged=true\" will list all privileged instances\n"
 "  - \"s.privileged=true\" will do the same\n"
 "\n"
 "A regular expression matching a configuration item or its value. (e.g. "
 "volatile.eth0.hwaddr=00:16:3e:.*).\n"
 "\n"
 "When multiple filters are passed, they are added one on top of the other,\n"
-"selecting containers which satisfy them all.\n"
+"selecting instances which satisfy them all.\n"
 "\n"
 "== Columns ==\n"
 "The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table or csv\n"
+"which instance attributes to output when displaying in table or csv\n"
 "format.\n"
 "\n"
 "Column arguments are either pre-defined shorthand chars (see below),\n"
@@ -1621,12 +1659,12 @@ msgid ""
 "  l - Last used date\n"
 "  n - Name\n"
 "  N - Number of Processes\n"
-"  p - PID of the container's init process\n"
+"  p - PID of the instance's init process\n"
 "  P - Profiles\n"
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its cluster member)\n"
+"  L - Location of the instance (e.g. its cluster member)\n"
 "  f - Base Image Fingerprint (short)\n"
 "  F - Base Image Fingerprint (long)\n"
 "\n"
@@ -1641,48 +1679,6 @@ msgid ""
 "  Defaults to -1 (unlimited). Use 0 to limit to the column header size."
 msgstr ""
 
-#: lxc/image_alias.go:149
-msgid "List image aliases"
-msgstr ""
-
-#: lxc/image_alias.go:150
-msgid ""
-"List image aliases\n"
-"\n"
-"Filters may be part of the image hash or part of the image alias name.\n"
-msgstr ""
-
-#: lxc/image.go:967
-msgid "List images"
-msgstr ""
-
-#: lxc/image.go:968
-msgid ""
-"List images\n"
-"\n"
-"Filters may be of the <key>=<value> form for property based filtering,\n"
-"or part of the image hash or part of the image alias name.\n"
-"\n"
-"The -c option takes a (optionally comma-separated) list of arguments\n"
-"that control which image attributes to output when displaying in table\n"
-"or csv format.\n"
-"\n"
-"Default column layout is: lfpdasu\n"
-"\n"
-"Column shorthand chars:\n"
-"\n"
-"    l - Shortest image alias (and optionally number of other aliases)\n"
-"    L - Newline-separated list of all image aliases\n"
-"    f - Fingerprint (short)\n"
-"    F - Fingerprint (long)\n"
-"    p - Whether image is public\n"
-"    d - Description\n"
-"    a - Architecture\n"
-"    s - Size\n"
-"    u - Upload date\n"
-"    t - Type"
-msgstr ""
-
 #: lxc/profile.go:576 lxc/profile.go:577
 msgid "List profiles"
 msgstr ""
@@ -1707,12 +1703,12 @@ msgstr ""
 msgid "List, show and delete background operations"
 msgstr ""
 
-#: lxc/info.go:440
+#: lxc/info.go:441
 #, c-format
 msgid "Location: %s"
 msgstr ""
 
-#: lxc/info.go:602
+#: lxc/info.go:613
 msgid "Log:"
 msgstr ""
 
@@ -1725,7 +1721,7 @@ msgstr ""
 msgid "MAC address: %s"
 msgstr ""
 
-#: lxc/info.go:207
+#: lxc/info.go:208
 #, c-format
 msgid "MAD: %s (%s)"
 msgstr ""
@@ -1752,7 +1748,7 @@ msgid "Make the image public"
 msgstr ""
 
 #: lxc/network.go:31 lxc/network.go:32
-msgid "Manage and attach containers to networks"
+msgid "Manage and attach instances to networks"
 msgstr ""
 
 #: lxc/cluster.go:28 lxc/cluster.go:29
@@ -1763,24 +1759,8 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
-#: lxc/config.go:30 lxc/config.go:31
-msgid "Manage container and server configuration options"
-msgstr ""
-
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage container devices"
-msgstr ""
-
-#: lxc/config_template.go:28 lxc/config_template.go:29
-msgid "Manage container file templates"
-msgstr ""
-
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
-msgid "Manage container metadata files"
-msgstr ""
-
 #: lxc/file.go:71 lxc/file.go:72
-msgid "Manage files in containers"
+msgid "Manage files in instances"
 msgstr ""
 
 #: lxc/image_alias.go:24 lxc/image_alias.go:25
@@ -1795,8 +1775,8 @@ msgstr ""
 msgid ""
 "Manage images\n"
 "\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
+"In LXD instances are created from images. Those images were themselves\n"
+"either generated from an existing instance or downloaded from an image\n"
 "server.\n"
 "\n"
 "When using remote images, LXD will automatically cache images for you\n"
@@ -1810,6 +1790,22 @@ msgid ""
 "hash or alias name (if one is set)."
 msgstr ""
 
+#: lxc/config.go:30 lxc/config.go:31
+msgid "Manage instance and server configuration options"
+msgstr ""
+
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage instance devices"
+msgstr ""
+
+#: lxc/config_template.go:28 lxc/config_template.go:29
+msgid "Manage instance file templates"
+msgstr ""
+
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+msgid "Manage instance metadata files"
+msgstr ""
+
 #: lxc/profile.go:28 lxc/profile.go:29
 msgid "Manage profiles"
 msgstr ""
@@ -1842,7 +1838,7 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/info.go:135 lxc/info.go:220
+#: lxc/info.go:136 lxc/info.go:221
 #, c-format
 msgid "Maximum number of VFs: %d"
 msgstr ""
@@ -1857,19 +1853,19 @@ msgstr ""
 msgid "Member %s renamed to %s"
 msgstr ""
 
-#: lxc/info.go:520
+#: lxc/info.go:521
 msgid "Memory (current)"
 msgstr ""
 
-#: lxc/info.go:524
+#: lxc/info.go:525
 msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/info.go:536
+#: lxc/info.go:537
 msgid "Memory usage:"
 msgstr ""
 
-#: lxc/info.go:338
+#: lxc/info.go:339
 msgid "Memory:"
 msgstr ""
 
@@ -1888,12 +1884,9 @@ msgstr ""
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
-msgid "Missing container name"
-msgstr ""
-
-#: lxc/profile.go:125
-msgid "Missing container.name name"
+#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/profile.go:660
+msgid "Missing instance name"
 msgstr ""
 
 #: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
@@ -1943,12 +1936,12 @@ msgstr ""
 msgid "Missing target directory"
 msgstr ""
 
-#: lxc/info.go:241
+#: lxc/info.go:242
 #, c-format
 msgid "Model: %s"
 msgstr ""
 
-#: lxc/info.go:126
+#: lxc/info.go:127
 #, c-format
 msgid "Model: %v"
 msgstr ""
@@ -1974,22 +1967,21 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
 #: lxc/move.go:36 lxc/move.go:37
-msgid "Move containers within or in between LXD instances"
+msgid "Move instances within or in between LXD servers"
 msgstr ""
 
 #: lxc/storage_volume.go:1141 lxc/storage_volume.go:1142
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
-msgid ""
-"Move the container without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/move.go:55
 msgid "Move the instance without its snapshots"
 msgstr ""
 
+#: lxc/move.go:54
+msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgstr ""
+
 #: lxc/storage_volume.go:365
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -2000,7 +1992,7 @@ msgid "Must run as root to import from directory"
 msgstr ""
 
 #: lxc/action.go:151
-msgid "Must supply container name for: "
+msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
@@ -2009,11 +2001,11 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:380
+#: lxc/info.go:381
 msgid "NIC:"
 msgstr ""
 
-#: lxc/info.go:383
+#: lxc/info.go:384
 msgid "NICs:"
 msgstr ""
 
@@ -2022,30 +2014,30 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:88 lxc/info.go:150 lxc/info.go:235 lxc/info.go:289
+#: lxc/info.go:89 lxc/info.go:151 lxc/info.go:236 lxc/info.go:290
 #, c-format
 msgid "NUMA node: %v"
 msgstr ""
 
-#: lxc/info.go:347
+#: lxc/info.go:348
 msgid "NUMA nodes:\n"
 msgstr ""
 
-#: lxc/info.go:123
+#: lxc/info.go:124
 msgid "NVIDIA information:"
 msgstr ""
 
-#: lxc/info.go:128
+#: lxc/info.go:129
 #, c-format
 msgid "NVRM Version: %v"
 msgstr ""
 
-#: lxc/info.go:438 lxc/network.go:771
+#: lxc/info.go:439 lxc/network.go:771
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/info.go:275
+#: lxc/info.go:276
 #, c-format
 msgid "Name: %v"
 msgstr ""
@@ -2074,7 +2066,7 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:553 lxc/network.go:785
+#: lxc/info.go:554 lxc/network.go:785
 msgid "Network usage:"
 msgstr ""
 
@@ -2111,13 +2103,13 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/info.go:349
+#: lxc/info.go:350
 #, c-format
 msgid "Node %d:\n"
 msgstr ""
 
 #: lxc/storage_volume.go:181 lxc/storage_volume.go:260
-msgid "Only \"custom\" volumes can be attached to containers"
+msgid "Only \"custom\" volumes can be attached to instances"
 msgstr ""
 
 #: lxc/storage_volume.go:1523
@@ -2149,7 +2141,7 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/info.go:99 lxc/info.go:161
+#: lxc/info.go:100 lxc/info.go:162
 #, c-format
 msgid "PCI address: %v"
 msgstr ""
@@ -2174,15 +2166,15 @@ msgstr ""
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:547 lxc/network.go:788
+#: lxc/info.go:548 lxc/network.go:788
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:548 lxc/network.go:789
+#: lxc/info.go:549 lxc/network.go:789
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/info.go:258
+#: lxc/info.go:259
 msgid "Partitions:"
 msgstr ""
 
@@ -2192,24 +2184,24 @@ msgid "Password for %s: "
 msgstr ""
 
 #: lxc/action.go:49 lxc/action.go:50
-msgid "Pause containers"
+msgid "Pause instances"
 msgstr ""
 
 #: lxc/copy.go:57
 msgid "Perform an incremental copy"
 msgstr ""
 
-#: lxc/info.go:465
+#: lxc/info.go:466
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/info.go:186
+#: lxc/info.go:187
 #, c-format
 msgid "Port type: %s"
 msgstr ""
 
-#: lxc/info.go:168
+#: lxc/info.go:169
 msgid "Ports:"
 msgstr ""
 
@@ -2239,7 +2231,7 @@ msgstr ""
 msgid "Print version number"
 msgstr ""
 
-#: lxc/info.go:489
+#: lxc/info.go:490
 #, c-format
 msgid "Processes: %d"
 msgstr ""
@@ -2249,7 +2241,7 @@ msgstr ""
 msgid "Processing aliases failed: %s"
 msgstr ""
 
-#: lxc/info.go:95 lxc/info.go:157
+#: lxc/info.go:96 lxc/info.go:158
 #, c-format
 msgid "Product: %v (%v)"
 msgstr ""
@@ -2285,11 +2277,11 @@ msgid "Profile %s renamed to %s"
 msgstr ""
 
 #: lxc/copy.go:47 lxc/init.go:49
-msgid "Profile to apply to the new container"
+msgid "Profile to apply to the new instance"
 msgstr ""
 
 #: lxc/move.go:52
-msgid "Profile to apply to the target container"
+msgid "Profile to apply to the target instance"
 msgstr ""
 
 #: lxc/profile.go:227
@@ -2305,7 +2297,7 @@ msgstr ""
 msgid "Profiles: "
 msgstr ""
 
-#: lxc/info.go:463
+#: lxc/info.go:464
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
@@ -2339,16 +2331,16 @@ msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:34 lxc/publish.go:35
-msgid "Publish containers as images"
+msgid "Publish instances as images"
 msgstr ""
 
 #: lxc/publish.go:222
 #, c-format
-msgid "Publishing container: %s"
+msgid "Publishing instance: %s"
 msgstr ""
 
 #: lxc/file.go:216 lxc/file.go:217
-msgid "Pull files from containers"
+msgid "Pull files from instances"
 msgstr ""
 
 #: lxc/file.go:364 lxc/file.go:687
@@ -2357,7 +2349,7 @@ msgid "Pulling %s from %s: %%s"
 msgstr ""
 
 #: lxc/file.go:406 lxc/file.go:407
-msgid "Push files into containers"
+msgid "Push files into instances"
 msgstr ""
 
 #: lxc/file.go:623 lxc/file.go:779
@@ -2369,7 +2361,7 @@ msgstr ""
 msgid "Query virtual machine images"
 msgstr ""
 
-#: lxc/info.go:254 lxc/info.go:263
+#: lxc/info.go:255 lxc/info.go:264
 #, c-format
 msgid "Read-Only: %v"
 msgstr ""
@@ -2384,7 +2376,7 @@ msgstr ""
 
 #: lxc/copy.go:388
 #, c-format
-msgid "Refreshing container: %s"
+msgid "Refreshing instance: %s"
 msgstr ""
 
 #: lxc/image.go:1294
@@ -2421,12 +2413,12 @@ msgstr ""
 msgid "Remote operation canceled by user"
 msgstr ""
 
-#: lxc/info.go:443
+#: lxc/info.go:444
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/info.go:255
+#: lxc/info.go:256
 #, c-format
 msgid "Removable: %v"
 msgstr ""
@@ -2445,11 +2437,11 @@ msgid "Remove aliases"
 msgstr ""
 
 #: lxc/config_device.go:415 lxc/config_device.go:416
-msgid "Remove container devices"
+msgid "Remove instance devices"
 msgstr ""
 
 #: lxc/profile.go:635 lxc/profile.go:636
-msgid "Remove profiles from containers"
+msgid "Remove profiles from instances"
 msgstr ""
 
 #: lxc/remote.go:596 lxc/remote.go:597
@@ -2470,7 +2462,7 @@ msgid "Rename aliases"
 msgstr ""
 
 #: lxc/rename.go:20 lxc/rename.go:21
-msgid "Rename containers and snapshots"
+msgid "Rename instances and snapshots"
 msgstr ""
 
 #: lxc/network.go:960 lxc/network.go:961
@@ -2502,7 +2494,7 @@ msgstr ""
 msgid "Renamed storage volume from \"%s\" to \"%s\""
 msgstr ""
 
-#: lxc/info.go:118
+#: lxc/info.go:119
 #, c-format
 msgid "Render: %s (%s)"
 msgstr ""
@@ -2511,38 +2503,38 @@ msgstr ""
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:486
+#: lxc/info.go:487
 msgid "Resources:"
 msgstr ""
 
 #: lxc/action.go:69
-msgid "Restart containers"
+msgid "Restart insances"
 msgstr ""
 
 #: lxc/action.go:70
 msgid ""
-"Restart containers\n"
+"Restart instances\n"
 "\n"
 "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/restore.go:23
-msgid "Restore containers from snapshots"
-msgstr ""
-
 #: lxc/restore.go:24
 msgid ""
-"Restore containers from snapshots\n"
+"Restore instaces from snapshots\n"
 "\n"
 "If --stateful is passed, then the running state will be restored too."
 msgstr ""
 
+#: lxc/restore.go:23
+msgid "Restore instances from snapshots"
+msgstr ""
+
 #: lxc/storage_volume.go:1562 lxc/storage_volume.go:1563
 msgid "Restore storage volume snapshots"
 msgstr ""
 
 #: lxc/console.go:39
-msgid "Retrieve the container's console log"
+msgid "Retrieve the instance's console log"
 msgstr ""
 
 #: lxc/init.go:285
@@ -2551,7 +2543,7 @@ msgid "Retrieving image: %s"
 msgstr ""
 
 #: lxc/action.go:111
-msgid "Run command against all containers"
+msgid "Run against all instances"
 msgstr ""
 
 #: lxc/image.go:1009
@@ -2566,7 +2558,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/info.go:133 lxc/info.go:218
+#: lxc/info.go:134 lxc/info.go:219
 msgid "SR-IOV information:"
 msgstr ""
 
@@ -2612,21 +2604,21 @@ msgid "Server version: %s\n"
 msgstr ""
 
 #: lxc/config_device.go:505
-msgid "Set container device configuration keys"
+msgid "Set instance device configuration keys"
 msgstr ""
 
 #: lxc/config_device.go:507
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config device set [<remote>:]<container> <device> <key> <value>"
+"    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
 #: lxc/config_device.go:513
 msgid ""
-"Set container device configuration keys\n"
+"Set instance device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2634,16 +2626,16 @@ msgid ""
 msgstr ""
 
 #: lxc/config.go:453
-msgid "Set container or server configuration keys"
+msgid "Set instance or server configuration keys"
 msgstr ""
 
 #: lxc/config.go:454
 msgid ""
-"Set container or server configuration keys\n"
+"Set instance or server configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
-"    lxc config set [<remote>:][<container>] <key> <value>"
+"    lxc config set [<remote>:][<instance>] <key> <value>"
 msgstr ""
 
 #: lxc/network.go:1010
@@ -2735,20 +2727,8 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
-msgid "Show container metadata files"
-msgstr ""
-
-#: lxc/config.go:579 lxc/config.go:580
-msgid "Show container or server configurations"
-msgstr ""
-
-#: lxc/info.go:31 lxc/info.go:32
-msgid "Show container or server information"
-msgstr ""
-
 #: lxc/config_template.go:295 lxc/config_template.go:296
-msgid "Show content of container file templates"
+msgid "Show content of instance file templates"
 msgstr ""
 
 #: lxc/cluster.go:145 lxc/cluster.go:146
@@ -2760,13 +2740,25 @@ msgid "Show details on a background operation"
 msgstr ""
 
 #: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for containers or profiles"
+msgid "Show full device configuration for instances or profiles"
 msgstr ""
 
 #: lxc/image.go:1344 lxc/image.go:1345
 msgid "Show image properties"
 msgstr ""
 
+#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+msgid "Show instance metadata files"
+msgstr ""
+
+#: lxc/config.go:579 lxc/config.go:580
+msgid "Show instance or server configurations"
+msgstr ""
+
+#: lxc/info.go:32 lxc/info.go:33
+msgid "Show instance or server information"
+msgstr ""
+
 #: lxc/main.go:223 lxc/main.go:224
 msgid "Show less common commands"
 msgstr ""
@@ -2799,10 +2791,6 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/info.go:42
-msgid "Show the container's last 100 log lines?"
-msgstr ""
-
 #: lxc/remote.go:418 lxc/remote.go:419
 msgid "Show the default remote"
 msgstr ""
@@ -2812,6 +2800,10 @@ msgid "Show the expanded configuration"
 msgstr ""
 
 #: lxc/info.go:43
+msgid "Show the instance's last 100 log lines?"
+msgstr ""
+
+#: lxc/info.go:44
 msgid "Show the resources available to the server"
 msgstr ""
 
@@ -2836,7 +2828,7 @@ msgstr ""
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:248 lxc/info.go:264
+#: lxc/info.go:249 lxc/info.go:265
 #, c-format
 msgid "Size: %s"
 msgstr ""
@@ -2845,18 +2837,18 @@ msgstr ""
 msgid "Snapshot storage volumes"
 msgstr ""
 
-#: lxc/info.go:567
+#: lxc/info.go:568
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/info.go:332
+#: lxc/info.go:333
 #, c-format
 msgid "Socket %d:"
 msgstr ""
 
 #: lxc/action.go:269
 #, c-format
-msgid "Some containers failed to %s"
+msgid "Some instances failed to %s"
 msgstr ""
 
 #: lxc/image.go:936
@@ -2864,7 +2856,7 @@ msgid "Source:"
 msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:31
-msgid "Start containers"
+msgid "Start instances"
 msgstr ""
 
 #: lxc/launch.go:68
@@ -2877,26 +2869,26 @@ msgstr ""
 msgid "State: %s"
 msgstr ""
 
-#: lxc/info.go:451
+#: lxc/info.go:452
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
 #: lxc/action.go:90 lxc/action.go:91
-msgid "Stop containers"
+msgid "Stop instances"
 msgstr ""
 
 #: lxc/publish.go:41
-msgid "Stop the container if currently running"
+msgid "Stop the instance if currently running"
 msgstr ""
 
 #: lxc/publish.go:145
-msgid "Stopping container failed!"
+msgid "Stopping instance failed!"
 msgstr ""
 
 #: lxc/delete.go:120
 #, c-format
-msgid "Stopping the container failed: %s"
+msgid "Stopping the instance failed: %s"
 msgstr ""
 
 #: lxc/storage.go:145
@@ -2937,24 +2929,24 @@ msgid "Storage volume moved successfully!"
 msgstr ""
 
 #: lxc/action.go:114
-msgid "Store the container state"
+msgid "Store the instance state"
 msgstr ""
 
-#: lxc/info.go:178
+#: lxc/info.go:179
 #, c-format
 msgid "Supported modes: %s"
 msgstr ""
 
-#: lxc/info.go:182
+#: lxc/info.go:183
 #, c-format
 msgid "Supported ports: %s"
 msgstr ""
 
-#: lxc/info.go:528
+#: lxc/info.go:529
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:532
+#: lxc/info.go:533
 msgid "Swap (peak)"
 msgstr ""
 
@@ -2975,11 +2967,7 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161
-msgid "The --container-only flag can't be used with --target"
-msgstr ""
-
-#: lxc/move.go:165
+#: lxc/move.go:161 lxc/move.go:165
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
@@ -2991,27 +2979,27 @@ msgstr ""
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
+#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+msgid "The device already exists"
+msgstr ""
+
+#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
+#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+msgid "The device doesn't exist"
+msgstr ""
+
 #: lxc/delete.go:104
-msgid "The container is currently running, stop it first or pass --force"
+msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
 #: lxc/publish.go:110
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
+"The instance is currently running. Use --force to have it stopped and "
 "restarted"
 msgstr ""
 
 #: lxc/init.go:388
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr ""
-
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
-msgid "The device already exists"
-msgstr ""
-
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
-msgid "The device doesn't exist"
+msgid "The instance you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/init.go:372
@@ -3029,7 +3017,7 @@ msgid "The profile device doesn't exist"
 msgstr ""
 
 #: lxc/move.go:236
-msgid "The source LXD instance is not clustered"
+msgid "The source LXD server is not clustered"
 msgstr ""
 
 #: lxc/network.go:434 lxc/network.go:519 lxc/storage_volume.go:673
@@ -3048,7 +3036,7 @@ msgstr ""
 #: lxc/main.go:242
 msgid ""
 "This client hasn't been configured to use a remote LXD server yet.\n"
-"As your platform can't run native Linux containers, you must connect to a "
+"As your platform can't run native Linux instances, you must connect to a "
 "remote LXD server.\n"
 "\n"
 "If you already added a remote server, make it the default with \"lxc remote "
@@ -3057,12 +3045,12 @@ msgid ""
 "https://multipass.run"
 msgstr ""
 
-#: lxc/info.go:290
+#: lxc/info.go:291
 msgid "Threads:"
 msgstr ""
 
 #: lxc/action.go:121
-msgid "Time to wait for the container before killing it"
+msgid "Time to wait for the instance before killing it"
 msgstr ""
 
 #: lxc/image.go:897
@@ -3070,7 +3058,7 @@ msgid "Timestamps:"
 msgstr ""
 
 #: lxc/init.go:390
-msgid "To attach a network to a container, use: lxc network attach"
+msgid "To attach a network to an instance, use: lxc network attach"
 msgstr ""
 
 #: lxc/init.go:389
@@ -3082,20 +3070,20 @@ msgid "To detach from the console, press: <ctrl>+a q"
 msgstr ""
 
 #: lxc/main.go:345
-msgid "To start your first container, try: lxc launch ubuntu:18.04"
+msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:293 lxc/config.go:418 lxc/config.go:536 lxc/config.go:617
-#: lxc/copy.go:116 lxc/info.go:309 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
-#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
+#: lxc/info.go:344 lxc/info.go:355 lxc/info.go:359 lxc/info.go:365
 #, c-format
 msgid "Total: %v"
 msgstr ""
 
-#: lxc/info.go:190
+#: lxc/info.go:191
 #, c-format
 msgid "Transceiver type: %s"
 msgstr ""
@@ -3112,14 +3100,14 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/image.go:725
 #, c-format
-msgid "Transferring container: %s"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/image.go:725
+#: lxc/copy.go:354
 #, c-format
-msgid "Transferring image: %s"
+msgid "Transferring instance: %s"
 msgstr ""
 
 #: lxc/action.go:196 lxc/launch.go:99
@@ -3127,12 +3115,12 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/image.go:895 lxc/info.go:245 lxc/info.go:460
+#: lxc/image.go:895 lxc/info.go:246 lxc/info.go:461
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: lxc/info.go:458
+#: lxc/info.go:459
 #, c-format
 msgid "Type: %s (ephemeral)"
 msgstr ""
@@ -3150,7 +3138,7 @@ msgstr ""
 msgid "USED BY"
 msgstr ""
 
-#: lxc/info.go:129
+#: lxc/info.go:130
 #, c-format
 msgid "UUID: %v"
 msgstr ""
@@ -3171,15 +3159,15 @@ msgid "Unknown file type '%s'"
 msgstr ""
 
 #: lxc/move.go:53
-msgid "Unset all profiles on the target container"
+msgid "Unset all profiles on the target instance"
 msgstr ""
 
 #: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset container device configuration keys"
+msgid "Unset instance device configuration keys"
 msgstr ""
 
 #: lxc/config.go:698 lxc/config.go:699
-msgid "Unset container or server configuration keys"
+msgid "Unset instance or server configuration keys"
 msgstr ""
 
 #: lxc/network.go:1142 lxc/network.go:1143
@@ -3202,6 +3190,11 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
+#: lxc/info.go:605
+#, c-format
+msgid "Unsupported instance type: %s"
+msgstr ""
+
 #: lxc/image.go:904
 #, c-format
 msgid "Uploaded: %s"
@@ -3212,7 +3205,7 @@ msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
 
-#: lxc/info.go:342 lxc/info.go:353 lxc/info.go:357 lxc/info.go:363
+#: lxc/info.go:343 lxc/info.go:354 lxc/info.go:358 lxc/info.go:364
 #, c-format
 msgid "Used: %v"
 msgstr ""
@@ -3230,27 +3223,27 @@ msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
 
-#: lxc/info.go:137 lxc/info.go:222
+#: lxc/info.go:138 lxc/info.go:223
 #, c-format
 msgid "VFs: %d"
 msgstr ""
 
-#: lxc/info.go:271
+#: lxc/info.go:272
 #, c-format
 msgid "Vendor: %v"
 msgstr ""
 
-#: lxc/info.go:91 lxc/info.go:153
+#: lxc/info.go:92 lxc/info.go:154
 #, c-format
 msgid "Vendor: %v (%v)"
 msgstr ""
 
-#: lxc/info.go:211
+#: lxc/info.go:212
 #, c-format
 msgid "Verb: %s (%s)"
 msgstr ""
 
-#: lxc/info.go:251
+#: lxc/info.go:252
 #, c-format
 msgid "WWN: %s"
 msgstr ""
@@ -3271,12 +3264,12 @@ msgstr ""
 
 #: lxc/restore.go:36
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
+"Whether or not to restore the instance's running state from snapshot (if "
 "available)"
 msgstr ""
 
 #: lxc/snapshot.go:34
-msgid "Whether or not to snapshot the container's running state"
+msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
@@ -3293,11 +3286,11 @@ msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
 #: lxc/copy.go:82
-msgid "You must specify a destination container name when using --target"
+msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
 #: lxc/copy.go:77 lxc/move.go:220
-msgid "You must specify a source container name"
+msgid "You must specify a source instance name"
 msgstr ""
 
 #: lxc/alias.go:52
@@ -3309,11 +3302,11 @@ msgid "add [<remote>:] <cert>"
 msgstr ""
 
 #: lxc/profile.go:99
-msgid "add [<remote>:]<container> <profile>"
+msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:74
-msgid "add [<remote>:]<container|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:83
@@ -3325,16 +3318,16 @@ msgid "alias"
 msgstr ""
 
 #: lxc/profile.go:161
-msgid "assign [<remote>:]<container> <profiles>"
+msgid "assign [<remote>:]<instance> <profiles>"
 msgstr ""
 
 #: lxc/network.go:106
 msgid ""
-"attach [<remote>:]<network> <container> [<device name>] [<interface name>]"
+"attach [<remote>:]<network> <instance> [<device name>] [<interface name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:137
-msgid "attach [<remote>:]<pool> <volume> <container> [<device name>] <path>"
+msgid "attach [<remote>:]<pool> <volume> <instance> [<device name>] <path>"
 msgstr ""
 
 #: lxc/storage_volume.go:216
@@ -3357,7 +3350,7 @@ msgid "config"
 msgstr ""
 
 #: lxc/console.go:30
-msgid "console [<remote>:]<container>"
+msgid "console [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/storage_volume.go:298
@@ -3381,7 +3374,7 @@ msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
 #: lxc/config_template.go:64
-msgid "create [<remote>:]<container> <template>"
+msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/network.go:252
@@ -3416,24 +3409,24 @@ msgstr ""
 msgid "delete [<remote>:]<alias>"
 msgstr ""
 
+#: lxc/image.go:267
+msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
+msgstr ""
+
 #: lxc/config_template.go:106
-msgid "delete [<remote>:]<container> <template>"
+msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:102
-msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
+msgid "delete [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...]"
 msgstr ""
 
 #: lxc/delete.go:27
 msgid ""
-"delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"delete [<remote>:]<instance>[/<snapshot>] [[<remote>:]<instance>[/"
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:267
-msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
-msgstr ""
-
 #: lxc/network.go:323
 msgid "delete [<remote>:]<network>"
 msgstr ""
@@ -3463,11 +3456,11 @@ msgid "description"
 msgstr ""
 
 #: lxc/network.go:374
-msgid "detach [<remote>:]<network> <container> [<device name>]"
+msgid "detach [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:613
-msgid "detach [<remote>:]<pool> <volume> <container> [<device name>]"
+msgid "detach [<remote>:]<pool> <volume> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:695
@@ -3475,7 +3468,7 @@ msgid "detach-profile [<remote:>]<pool> <volume> <profile> [<device name>]"
 msgstr ""
 
 #: lxc/network.go:459
-msgid "detach-profile [<remote>:]<network> <container> [<device name>]"
+msgid "detach-profile [<remote>:]<network> <instance> [<device name>]"
 msgstr ""
 
 #: lxc/config_device.go:22
@@ -3490,20 +3483,20 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/image.go:319
+msgid "edit [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
-msgid "edit [<remote>:]<container>"
+msgid "edit [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:149
-msgid "edit [<remote>:]<container> <template>"
+msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/file.go:152
-msgid "edit [<remote>:]<container>/<path>"
-msgstr ""
-
-#: lxc/image.go:319
-msgid "edit [<remote>:]<image>"
+msgid "edit [<remote>:]<instance>/<path>"
 msgstr ""
 
 #: lxc/network.go:544
@@ -3527,7 +3520,7 @@ msgid "edit [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:88
-msgid "edit [<remote>:][<container>[/<snapshot>]]"
+msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/cluster.go:329
@@ -3544,30 +3537,29 @@ msgid "error: %v"
 msgstr ""
 
 #: lxc/exec.go:39
-msgid "exec [<remote>:]<container> [flags] [--] <command line>"
+msgid "exec [<remote>:]<instance> [flags] [--] <command line>"
 msgstr ""
 
-#: lxc/info.go:578
+#: lxc/info.go:579
 #, c-format
 msgid "expires at %s"
 msgstr ""
 
-#: lxc/export.go:31
-msgid ""
-"export [<remote>:]<container> [target] [--container-only] [--optimized-"
-"storage]"
-msgstr ""
-
 #: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
+#: lxc/export.go:31
+msgid ""
+"export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
+msgstr ""
+
 #: lxc/file.go:70
 msgid "file"
 msgstr ""
 
 #: lxc/config_device.go:186
-msgid "get [<remote>:]<container|profile> <device> <key>"
+msgid "get [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:667
@@ -3591,7 +3583,7 @@ msgid "get [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:371
-msgid "get [<remote>:][<container>] <key>"
+msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/remote.go:417
@@ -3628,8 +3620,8 @@ msgstr ""
 msgid "info [<remote>:]<pool>"
 msgstr ""
 
-#: lxc/info.go:30
-msgid "info [<remote>:][<container>]"
+#: lxc/info.go:31
+msgid "info [<remote>:][<instance>]"
 msgstr ""
 
 #: lxc/init.go:38
@@ -3658,11 +3650,11 @@ msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
 #: lxc/config_template.go:235
-msgid "list [<remote>:]<container>"
+msgid "list [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_device.go:258
-msgid "list [<remote>:]<container|profile>"
+msgid "list [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/storage_volume.go:1066
@@ -3693,21 +3685,21 @@ msgstr ""
 
 #: lxc/config_device.go:79
 msgid ""
-"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"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 container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/config.go:92
 msgid ""
-"lxc config edit <container> < container.yaml\n"
-"    Update the container configuration from config.yaml."
+"lxc config edit <instance> < instance.yaml\n"
+"    Update the instance configuration from config.yaml."
 msgstr ""
 
 #: lxc/config.go:459
 msgid ""
-"lxc config set [<remote>:]<container> limits.cpu=2\n"
-"    Will set a CPU limit of \"2\" for the container.\n"
+"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"
@@ -3719,20 +3711,20 @@ msgstr ""
 #: lxc/export.go:35
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
-"    Download a backup tarball of the u1 container."
+"    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 container and write it to the current "
+"   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 container \"foo\"."
+"   To push /etc/hosts into the instance \"foo\"."
 msgstr ""
 
 #: lxc/image.go:323
@@ -3747,13 +3739,13 @@ msgstr ""
 #: lxc/import.go:30
 msgid ""
 "lxc import backup0.tar.gz\n"
-"    Create a new container using backup0.tar.gz as the source."
+"    Create a new instance using backup0.tar.gz as the source."
 msgstr ""
 
-#: lxc/info.go:34
+#: lxc/info.go:35
 msgid ""
-"lxc info [<remote>:]<container> [--show-log]\n"
-"    For container information.\n"
+"lxc info [<remote>:]<instance> [--show-log]\n"
+"    For instance information.\n"
 "\n"
 "lxc info [<remote>:] [--resources]\n"
 "    For LXD server information."
@@ -3764,7 +3756,7 @@ msgid ""
 "lxc init ubuntu:16.04 u1\n"
 "\n"
 "lxc init ubuntu:16.04 u1 < config.yaml\n"
-"    Create the container with configuration from config.yaml"
+"    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
@@ -3772,17 +3764,17 @@ msgid ""
 "lxc launch ubuntu:16.04 u1\n"
 "\n"
 "lxc launch ubuntu:16.04 u1 < config.yaml\n"
-"    Create and start the container with configuration from config.yaml"
+"    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/list.go:104
 msgid ""
 "lxc list -c nFs46,volatile.eth0.hwaddr:MAC,config:image.os,devices:eth0."
 "parent:ETHP\n"
-"  Show containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
+"  Show instances using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\", "
 "\"IPV6\" and \"MAC\" columns.\n"
 "  \"BASE IMAGE\", \"MAC\" and \"IMAGE OS\" are custom columns generated from "
-"container configuration keys.\n"
+"instance configuration keys.\n"
 "  \"ETHP\" is a custom column generated from a device key.\n"
 "\n"
 "lxc list -c ns,user.comment:comment\n"
@@ -3803,15 +3795,15 @@ msgstr ""
 
 #: lxc/move.go:39
 msgid ""
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
-"[--container-only]\n"
-"    Move a container between two hosts, renaming it if destination name "
+"lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
+"instance-only]\n"
+"    Move an instance between two hosts, renaming it if destination name "
 "differs.\n"
 "\n"
-"lxc move <old name> <new name> [--container-only]\n"
-"    Rename a local container.\n"
+"lxc move <old name> <new name> [--instance-only]\n"
+"    Rename a local instance.\n"
 "\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>\n"
 "    Rename a snapshot."
 msgstr ""
 
@@ -3837,7 +3829,7 @@ msgstr ""
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
-"    Will mount the host's /share/c1 onto /opt in the container."
+"    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr ""
 
 #: lxc/profile.go:406
@@ -3854,8 +3846,8 @@ msgstr ""
 
 #: lxc/query.go:33
 msgid ""
-"lxc query -X DELETE --wait /1.0/containers/c1\n"
-"    Delete local container \"c1\"."
+"lxc query -X DELETE --wait /1.0/instances/c1\n"
+"    Delete local instance \"c1\"."
 msgstr ""
 
 #: lxc/snapshot.go:29
@@ -3914,8 +3906,7 @@ msgstr ""
 
 #: lxc/move.go:34
 msgid ""
-"move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]]"
+"move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/storage.go:444
@@ -3939,11 +3930,11 @@ msgid "operation"
 msgstr ""
 
 #: lxc/config_device.go:325
-msgid "override [<remote>:]<container> <device> [key=value...]"
+msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
 #: lxc/action.go:48
-msgid "pause [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "pause [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/config.go:54
@@ -3960,19 +3951,18 @@ msgstr ""
 
 #: lxc/publish.go:33
 msgid ""
-"publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
-"[key=value...]"
+"publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
 
 #: lxc/file.go:215
 msgid ""
-"pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
-"<target path>"
+"pull [<remote>:]<instance>/<path> [[<remote>:]<instance>/<path>...] <target "
+"path>"
 msgstr ""
 
 #: lxc/file.go:405
 msgid ""
-"push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"push <source path> [<remote>:]<instance>/<path> [[<remote>:]<instance>/"
 "<path>...]"
 msgstr ""
 
@@ -4001,11 +3991,11 @@ msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
 #: lxc/profile.go:634
-msgid "remove [<remote>:]<container> <profile>"
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/config_device.go:413
-msgid "remove [<remote>:]<container|profile> <name>..."
+msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
 #: lxc/cluster.go:243
@@ -4025,7 +4015,7 @@ msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
 #: lxc/rename.go:19
-msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
+msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
 #: lxc/cluster.go:193
@@ -4051,11 +4041,11 @@ msgid "rename [<remote>:]<project> <new-name>"
 msgstr ""
 
 #: lxc/action.go:68
-msgid "restart [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "restart [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/restore.go:22
-msgid "restore [<remote>:]<container> <snapshot>"
+msgid "restore [<remote>:]<instance> <snapshot>"
 msgstr ""
 
 #: lxc/storage_volume.go:1561
@@ -4063,7 +4053,7 @@ msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
 #: lxc/config_device.go:504
-msgid "set [<remote>:]<container|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1009
@@ -4087,27 +4077,27 @@ msgid "set [<remote>:]<project> <key>=<value>..."
 msgstr ""
 
 #: lxc/config.go:452
-msgid "set [<remote>:][<container>] <key>=<value>..."
+msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
 #: lxc/remote.go:683
 msgid "set-url <remote> <URL>"
 msgstr ""
 
+#: lxc/image.go:1343
+msgid "show [<remote>:]<image>"
+msgstr ""
+
 #: lxc/config_metadata.go:173
-msgid "show [<remote>:]<container>"
+msgid "show [<remote>:]<instance>"
 msgstr ""
 
 #: lxc/config_template.go:294
-msgid "show [<remote>:]<container> <template>"
+msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
 #: lxc/config_device.go:611
-msgid "show [<remote>:]<container|profile>"
-msgstr ""
-
-#: lxc/image.go:1343
-msgid "show [<remote>:]<image>"
+msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
 #: lxc/cluster.go:144
@@ -4139,11 +4129,11 @@ msgid "show [<remote>:]<project>"
 msgstr ""
 
 #: lxc/config.go:578
-msgid "show [<remote>:][<container>[/<snapshot>]]"
+msgid "show [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
 #: lxc/snapshot.go:22
-msgid "snapshot [<remote>:]<container> [<snapshot name>]"
+msgid "snapshot [<remote>:]<instance> [<snapshot name>]"
 msgstr ""
 
 #: lxc/storage_volume.go:1490
@@ -4155,19 +4145,19 @@ msgid "space used"
 msgstr ""
 
 #: lxc/action.go:29
-msgid "start [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "start [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
-#: lxc/info.go:582
+#: lxc/info.go:583
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:584
+#: lxc/info.go:585
 msgid "stateless"
 msgstr ""
 
 #: lxc/action.go:89
-msgid "stop [<remote>:]<container> [[<remote>:]<container>...]"
+msgid "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgstr ""
 
 #: lxc/storage.go:31
@@ -4182,7 +4172,7 @@ msgstr ""
 msgid "switch [<remote>:] <project>"
 msgstr ""
 
-#: lxc/info.go:574
+#: lxc/info.go:575
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -4204,7 +4194,7 @@ msgid "unreachable"
 msgstr ""
 
 #: lxc/config_device.go:679
-msgid "unset [<remote>:]<container|profile> <device> <key>"
+msgid "unset [<remote>:]<instance|profile> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1141
@@ -4228,7 +4218,7 @@ msgid "unset [<remote>:]<project> <key>"
 msgstr ""
 
 #: lxc/config.go:697
-msgid "unset [<remote>:][<container>] <key>"
+msgid "unset [<remote>:][<instance>] <key>"
 msgstr ""
 
 #: lxc/storage.go:442


More information about the lxc-devel mailing list