[lxc-devel] [lxd/master] Add support for image and imge aliases types

stgraber on Github lxc-bot at linuxcontainers.org
Fri Sep 13 13:52:01 UTC 2019


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/20190913/ea649e4c/attachment-0001.bin>
-------------- next part --------------
From d9fab512d3b0f498fbfc226368a5ca08cbf428dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 23 Aug 2019 14:23:54 -0700
Subject: [PATCH 01/13] api: Add image_types API extension
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>
---
 doc/api-extensions.md | 3 +++
 shared/version/api.go | 1 +
 2 files changed, 4 insertions(+)

diff --git a/doc/api-extensions.md b/doc/api-extensions.md
index e562f4a32e..98f0a39a83 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -826,3 +826,6 @@ pool be used for storing the daemon-wide images and backups artifacts.
 
 ## instances
 This introduces the concept of instances, of which currently the only type is "container".
+
+## image\_types
+This introduces support for a new Type field on images, indicating what type of images they are.
diff --git a/shared/version/api.go b/shared/version/api.go
index dd9979868f..48aa25a7d7 100644
--- a/shared/version/api.go
+++ b/shared/version/api.go
@@ -165,6 +165,7 @@ var APIExtensions = []string{
 	"resources_infiniband",
 	"daemon_storage",
 	"instances",
+	"image_types",
 }
 
 // APIExtensionsCount returns the number of available API extensions.

From 0710aea190cf4e7ef475810cb49ad6d40a1dbc02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 23 Aug 2019 14:23:23 -0700
Subject: [PATCH 02/13] shared/api: Add image types
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>
---
 shared/api/image.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared/api/image.go b/shared/api/image.go
index 3f1834d10c..3545169ebd 100644
--- a/shared/api/image.go
+++ b/shared/api/image.go
@@ -55,6 +55,9 @@ type Image struct {
 	Size         int64        `json:"size" yaml:"size"`
 	UpdateSource *ImageSource `json:"update_source,omitempty" yaml:"update_source,omitempty"`
 
+	// API extension: image_types
+	Type string `json:"type" yaml:"type"`
+
 	CreatedAt  time.Time `json:"created_at" yaml:"created_at"`
 	ExpiresAt  time.Time `json:"expires_at" yaml:"expires_at"`
 	LastUsedAt time.Time `json:"last_used_at" yaml:"last_used_at"`

From 66e1ec7b70f66f34f997ab9ac913ac0843df68b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 3 Sep 2019 20:08:06 -0400
Subject: [PATCH 03/13] shared/api: Add image alias types

---
 shared/api/image.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared/api/image.go b/shared/api/image.go
index 3545169ebd..060e086e1e 100644
--- a/shared/api/image.go
+++ b/shared/api/image.go
@@ -104,6 +104,9 @@ type ImageAliasesEntry struct {
 	ImageAliasesEntryPut `yaml:",inline"`
 
 	Name string `json:"name" yaml:"name"`
+
+	// API extension: image_types
+	Type string `json:"type" yaml:"type"`
 }
 
 // ImageMetadata represents LXD image metadata

From dccb746f6958b3249f364530e7fe745bc1573850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 5 Sep 2019 17:04:46 -0400
Subject: [PATCH 04/13] shared/api: Add image source types
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>
---
 shared/api/image.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/shared/api/image.go b/shared/api/image.go
index 060e086e1e..c927bbf3f0 100644
--- a/shared/api/image.go
+++ b/shared/api/image.go
@@ -34,6 +34,9 @@ type ImagesPostSource struct {
 	// For type "image"
 	Fingerprint string `json:"fingerprint" yaml:"fingerprint"`
 	Secret      string `json:"secret" yaml:"secret"`
+
+	// API extension: image_types
+	ImageType string `json:"image_type" yaml:"image_type"`
 }
 
 // ImagePut represents the modifiable fields of a LXD image
@@ -81,6 +84,9 @@ type ImageSource struct {
 	Certificate string `json:"certificate" yaml:"certificate"`
 	Protocol    string `json:"protocol" yaml:"protocol"`
 	Server      string `json:"server" yaml:"server"`
+
+	// API extension: image_types
+	Type string `json:"type" yaml:"type"`
 }
 
 // ImageAliasesPost represents a new LXD image alias

From 7f86c16c39c9f5f820ac331441c0044a2b0305c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 3 Sep 2019 20:07:48 -0400
Subject: [PATCH 05/13] shared/simplestreams: Add 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>
---
 shared/simplestreams/products.go      |  9 ++++-
 shared/simplestreams/simplestreams.go | 51 +++++++++++++++++++--------
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/shared/simplestreams/products.go b/shared/simplestreams/products.go
index b1b06c0681..939a9cf26d 100644
--- a/shared/simplestreams/products.go
+++ b/shared/simplestreams/products.go
@@ -43,6 +43,7 @@ type ProductVersion struct {
 
 // ProductVersionItem represents a file/item of a particular ProductVersion
 type ProductVersionItem struct {
+	LXDHashSha256DiskImg  string `json:"combined_disk1-img_sha256,omitempty"`
 	LXDHashSha256RootXz   string `json:"combined_rootxz_sha256,omitempty"`
 	LXDHashSha256         string `json:"combined_sha256,omitempty"`
 	LXDHashSha256SquashFs string `json:"combined_squashfs_sha256,omitempty"`
@@ -108,6 +109,8 @@ func (s *Products) ToLXD() ([]api.Image, map[string][][]string) {
 						}
 					} else if root.FileType == "squashfs" {
 						fingerprint = meta.LXDHashSha256SquashFs
+					} else if root.FileType == "disk1.img" {
+						fingerprint = meta.LXDHashSha256DiskImg
 					}
 				} else {
 					fingerprint = meta.HashSha256
@@ -155,9 +158,13 @@ func (s *Products) ToLXD() ([]api.Image, map[string][][]string) {
 					"serial":       name,
 					"description":  description,
 				}
+				image.Type = "container"
 
 				if root != nil {
 					image.Properties["type"] = root.FileType
+					if root.FileType == "disk1.img" {
+						image.Type = "virtual-machine"
+					}
 				} else {
 					image.Properties["type"] = "tar.gz"
 				}
@@ -247,7 +254,7 @@ func (s *Products) ToLXD() ([]api.Image, map[string][][]string) {
 				if item.FileType == "lxd.tar.xz" {
 					// Locate the root files
 					for _, subItem := range version.Items {
-						if shared.StringInSlice(subItem.FileType, []string{"root.tar.xz", "squashfs"}) {
+						if shared.StringInSlice(subItem.FileType, []string{"disk1.img", "root.tar.xz", "squashfs"}) {
 							err := addImage(&item, &subItem)
 							if err != nil {
 								continue
diff --git a/shared/simplestreams/simplestreams.go b/shared/simplestreams/simplestreams.go
index f6f805894f..7d1e9da856 100644
--- a/shared/simplestreams/simplestreams.go
+++ b/shared/simplestreams/simplestreams.go
@@ -43,7 +43,7 @@ type SimpleStreams struct {
 	cachedStream   *Stream
 	cachedProducts map[string]*Products
 	cachedImages   []api.Image
-	cachedAliases  map[string]*api.ImageAliasesEntry
+	cachedAliases  map[string]map[string]*api.ImageAliasesEntry
 }
 
 func (s *SimpleStreams) parseStream() (*Stream, error) {
@@ -130,11 +130,13 @@ func (s *SimpleStreams) parseProducts(path string) (*Products, error) {
 	return &products, nil
 }
 
-func (s *SimpleStreams) applyAliases(images []api.Image) ([]api.Image, map[string]*api.ImageAliasesEntry, error) {
-	aliases := map[string]*api.ImageAliasesEntry{}
+func (s *SimpleStreams) applyAliases(images []api.Image) ([]api.Image, map[string]map[string]*api.ImageAliasesEntry, error) {
+	aliases := map[string]map[string]*api.ImageAliasesEntry{}
 
+	// Sort the images so we tag the preferred ones
 	sort.Sort(sortedImages(images))
 
+	// Look for the default OS
 	defaultOS := ""
 	for k, v := range urlDefaultOS {
 		if strings.HasPrefix(s.url, k) {
@@ -143,19 +145,24 @@ func (s *SimpleStreams) applyAliases(images []api.Image) ([]api.Image, map[strin
 		}
 	}
 
-	addAlias := func(name string, fingerprint string) *api.ImageAlias {
+	addAlias := func(imageType string, name string, fingerprint string) *api.ImageAlias {
+		if aliases[imageType] == nil {
+			aliases[imageType] = map[string]*api.ImageAliasesEntry{}
+		}
+
 		if defaultOS != "" {
 			name = strings.TrimPrefix(name, fmt.Sprintf("%s/", defaultOS))
 		}
 
-		if aliases[name] != nil {
+		if aliases[imageType][name] != nil {
 			return nil
 		}
 
 		alias := api.ImageAliasesEntry{}
 		alias.Name = name
 		alias.Target = fingerprint
-		aliases[name] = &alias
+		alias.Type = imageType
+		aliases[imageType][name] = &alias
 
 		return &api.ImageAlias{Name: name}
 	}
@@ -172,14 +179,14 @@ func (s *SimpleStreams) applyAliases(images []api.Image) ([]api.Image, map[strin
 			for _, entry := range aliases {
 				// Short
 				if image.Architecture == architectureName {
-					alias := addAlias(fmt.Sprintf("%s", entry.Name), image.Fingerprint)
+					alias := addAlias(image.Type, fmt.Sprintf("%s", entry.Name), image.Fingerprint)
 					if alias != nil {
 						image.Aliases = append(image.Aliases, *alias)
 					}
 				}
 
 				// Medium
-				alias := addAlias(fmt.Sprintf("%s/%s", entry.Name, image.Properties["architecture"]), image.Fingerprint)
+				alias := addAlias(image.Type, fmt.Sprintf("%s/%s", entry.Name, image.Properties["architecture"]), image.Fingerprint)
 				if alias != nil {
 					image.Aliases = append(image.Aliases, *alias)
 				}
@@ -192,7 +199,7 @@ func (s *SimpleStreams) applyAliases(images []api.Image) ([]api.Image, map[strin
 	return newImages, aliases, nil
 }
 
-func (s *SimpleStreams) getImages() ([]api.Image, map[string]*api.ImageAliasesEntry, error) {
+func (s *SimpleStreams) getImages() ([]api.Image, map[string]map[string]*api.ImageAliasesEntry, error) {
 	if s.cachedImages != nil && s.cachedAliases != nil {
 		return s.cachedImages, s.cachedAliases, nil
 	}
@@ -301,8 +308,10 @@ func (s *SimpleStreams) ListAliases() ([]api.ImageAliasesEntry, error) {
 
 	aliases := []api.ImageAliasesEntry{}
 
-	for _, alias := range aliasesMap {
-		aliases = append(aliases, *alias)
+	for _, entries := range aliasesMap {
+		for _, alias := range entries {
+			aliases = append(aliases, *alias)
+		}
 	}
 
 	return aliases, nil
@@ -315,18 +324,30 @@ func (s *SimpleStreams) ListImages() ([]api.Image, error) {
 }
 
 // GetAlias returns a LXD ImageAliasesEntry for the provided alias name
-func (s *SimpleStreams) GetAlias(name string) (*api.ImageAliasesEntry, error) {
+func (s *SimpleStreams) GetAlias(imageType string, name string) (*api.ImageAliasesEntry, error) {
 	_, aliasesMap, err := s.getImages()
 	if err != nil {
 		return nil, err
 	}
 
-	alias, ok := aliasesMap[name]
-	if !ok {
+	var match *api.ImageAliasesEntry
+	for entryType, entries := range aliasesMap {
+		for aliasName, alias := range entries {
+			if aliasName == name && (entryType == imageType || imageType == "") {
+				if match != nil {
+					return nil, fmt.Errorf("More than one match for alias '%s'", name)
+				}
+
+				match = alias
+			}
+		}
+	}
+
+	if match == nil {
 		return nil, fmt.Errorf("Alias '%s' doesn't exist", name)
 	}
 
-	return alias, nil
+	return match, nil
 }
 
 // GetImage returns a LXD image for the provided image fingerprint

From 4f67e64583a815b8a8970e5d3d1bb3aae9000414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 3 Sep 2019 20:08:30 -0400
Subject: [PATCH 06/13] client: Update for simplestreams change
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>
---
 client/simplestreams_images.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/simplestreams_images.go b/client/simplestreams_images.go
index 735e2d8075..e46fdc3858 100644
--- a/client/simplestreams_images.go
+++ b/client/simplestreams_images.go
@@ -229,7 +229,7 @@ func (r *ProtocolSimpleStreams) GetImageAliasNames() ([]string, error) {
 
 // GetImageAlias returns an existing alias as an ImageAliasesEntry struct
 func (r *ProtocolSimpleStreams) GetImageAlias(name string) (*api.ImageAliasesEntry, string, error) {
-	alias, err := r.ssClient.GetAlias(name)
+	alias, err := r.ssClient.GetAlias("container", name)
 	if err != nil {
 		return nil, "", err
 	}

From 5a1da1775e0f06eef7edf74bdd3e74d7c6ea8b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 5 Sep 2019 16:23:02 -0400
Subject: [PATCH 07/13] client: Add GetImageAliasType
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>
---
 client/interfaces.go           |  1 +
 client/lxd_images.go           | 14 ++++++++++++++
 client/simplestreams_images.go | 17 +++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/client/interfaces.go b/client/interfaces.go
index 9dbb5010e0..02e7bf0cb1 100644
--- a/client/interfaces.go
+++ b/client/interfaces.go
@@ -55,6 +55,7 @@ type ImageServer interface {
 	GetImageAliasNames() (names []string, err error)
 
 	GetImageAlias(name string) (alias *api.ImageAliasesEntry, ETag string, err error)
+	GetImageAliasType(imageType string, name string) (alias *api.ImageAliasesEntry, ETag string, err error)
 }
 
 // The InstanceServer type represents a full featured LXD server.
diff --git a/client/lxd_images.go b/client/lxd_images.go
index 09cc3f9c3f..6b2fc5a20b 100644
--- a/client/lxd_images.go
+++ b/client/lxd_images.go
@@ -319,6 +319,20 @@ func (r *ProtocolLXD) GetImageAlias(name string) (*api.ImageAliasesEntry, string
 	return &alias, etag, nil
 }
 
+// GetImageAliasType returns an existing alias as an ImageAliasesEntry struct
+func (r *ProtocolLXD) GetImageAliasType(imageType string, name string) (*api.ImageAliasesEntry, string, error) {
+	alias, etag, err := r.GetImageAlias(name)
+	if err != nil {
+		return nil, "", err
+	}
+
+	if imageType != "" && alias.Type != imageType {
+		return nil, "", fmt.Errorf("Alias doesn't exist for the specified type")
+	}
+
+	return alias, etag, nil
+}
+
 // CreateImage requests that LXD creates, copies or import a new image
 func (r *ProtocolLXD) CreateImage(image api.ImagesPost, args *ImageCreateArgs) (Operation, error) {
 	if image.CompressionAlgorithm != "" {
diff --git a/client/simplestreams_images.go b/client/simplestreams_images.go
index e46fdc3858..cb05607d75 100644
--- a/client/simplestreams_images.go
+++ b/client/simplestreams_images.go
@@ -230,6 +230,23 @@ func (r *ProtocolSimpleStreams) GetImageAliasNames() ([]string, error) {
 // GetImageAlias returns an existing alias as an ImageAliasesEntry struct
 func (r *ProtocolSimpleStreams) GetImageAlias(name string) (*api.ImageAliasesEntry, string, error) {
 	alias, err := r.ssClient.GetAlias("container", name)
+	if err != nil {
+		alias, err = r.ssClient.GetAlias("virtual-machine", name)
+		if err != nil {
+			return nil, "", err
+		}
+	}
+
+	return alias, "", err
+}
+
+// GetImageAliasType returns an existing alias as an ImageAliasesEntry struct
+func (r *ProtocolSimpleStreams) GetImageAliasType(imageType string, name string) (*api.ImageAliasesEntry, string, error) {
+	if imageType == "" {
+		return r.GetImageAlias(name)
+	}
+
+	alias, err := r.ssClient.GetAlias(imageType, name)
 	if err != nil {
 		return nil, "", err
 	}

From 7786fe3f582ebfd8f2b388abc16978243d5e33fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 5 Sep 2019 17:04:06 -0400
Subject: [PATCH 08/13] client: Introduce Type to ImageCopyArgs
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>
---
 client/interfaces.go | 3 +++
 client/lxd_images.go | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/client/interfaces.go b/client/interfaces.go
index 02e7bf0cb1..9dd9b7f5cf 100644
--- a/client/interfaces.go
+++ b/client/interfaces.go
@@ -384,6 +384,9 @@ type ImageCopyArgs struct {
 
 	// Whether this image is to be made available to unauthenticated users
 	Public bool
+
+	// The image type to use for resolution
+	Type string
 }
 
 // The StoragePoolVolumeCopyArgs struct is used to pass additional options
diff --git a/client/lxd_images.go b/client/lxd_images.go
index 6b2fc5a20b..519bd9f428 100644
--- a/client/lxd_images.go
+++ b/client/lxd_images.go
@@ -602,6 +602,10 @@ func (r *ProtocolLXD) CopyImage(source ImageServer, image api.Image, args *Image
 		},
 	}
 
+	if args != nil {
+		req.Source.ImageType = args.Type
+	}
+
 	// Generate secret token if needed
 	if !image.Public {
 		secret, err := source.GetImageSecret(image.Fingerprint)

From bbc9d6a55e45fb907e240fc0bcd74a570f09ba50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 23 Aug 2019 14:24:38 -0700
Subject: [PATCH 09/13] lxd/images: Add support for image types
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>
---
 lxd/container.go       | 10 ++++++
 lxd/containers_post.go |  2 +-
 lxd/daemon_images.go   | 22 +++++++++----
 lxd/db/images.go       | 72 +++++++++++++++++++++++++++++++-----------
 lxd/images.go          | 67 +++++++++++++++++++++++++--------------
 5 files changed, 125 insertions(+), 48 deletions(-)

diff --git a/lxd/container.go b/lxd/container.go
index cd0edf6a2e..9206014763 100644
--- a/lxd/container.go
+++ b/lxd/container.go
@@ -451,6 +451,16 @@ func containerCreateFromImage(d *Daemon, args db.ContainerArgs, hash string, tra
 		return nil, errors.Wrapf(err, "Fetch image %s from database", hash)
 	}
 
+	// Validate the type of the image matches the type of the instance.
+	imgType, err := instance.New(img.Type)
+	if err != nil {
+		return nil, err
+	}
+
+	if imgType != args.Type {
+		return nil, fmt.Errorf("Requested image doesn't match instance type")
+	}
+
 	// Check if the image is available locally or it's on another node.
 	nodeAddress, err := s.Cluster.ImageLocate(hash)
 	if err != nil {
diff --git a/lxd/containers_post.go b/lxd/containers_post.go
index e6858c0077..5757fe9d01 100644
--- a/lxd/containers_post.go
+++ b/lxd/containers_post.go
@@ -113,7 +113,7 @@ func createFromImage(d *Daemon, project string, req *api.ContainersPost) Respons
 			}
 			info, err = d.ImageDownload(
 				op, req.Source.Server, req.Source.Protocol, req.Source.Certificate,
-				req.Source.Secret, hash, true, autoUpdate, "", true, project)
+				req.Source.Secret, hash, "container", true, autoUpdate, "", true, project)
 			if err != nil {
 				return err
 			}
diff --git a/lxd/daemon_images.go b/lxd/daemon_images.go
index 1ca912dfd7..d5a0f1e9a0 100644
--- a/lxd/daemon_images.go
+++ b/lxd/daemon_images.go
@@ -79,7 +79,7 @@ func imageGetStreamCache(d *Daemon) (map[string]*imageStreamCacheEntry, error) {
 }
 
 // ImageDownload resolves the image fingerprint and if not in the database, downloads it
-func (d *Daemon) ImageDownload(op *operation, server string, protocol string, certificate string, secret string, alias string, forContainer bool, autoUpdate bool, storagePool string, preferCached bool, project string) (*api.Image, error) {
+func (d *Daemon) ImageDownload(op *operation, server string, protocol string, certificate string, secret string, alias string, imageType string, forContainer bool, autoUpdate bool, storagePool string, preferCached bool, project string) (*api.Image, error) {
 	var err error
 	var ctxMap log.Ctx
 
@@ -177,6 +177,10 @@ func (d *Daemon) ImageDownload(op *operation, server string, protocol string, ce
 				continue
 			}
 
+			if imageType != "" && entry.Type != imageType {
+				continue
+			}
+
 			fp = entry.Target
 			break
 		}
@@ -210,7 +214,7 @@ func (d *Daemon) ImageDownload(op *operation, server string, protocol string, ce
 		// For public images, handle aliases and initial metadata
 		if secret == "" {
 			// Look for a matching alias
-			entry, _, err := remote.GetImageAlias(fp)
+			entry, _, err := remote.GetImageAliasType(imageType, fp)
 			if err == nil {
 				fp = entry.Target
 			}
@@ -235,7 +239,7 @@ func (d *Daemon) ImageDownload(op *operation, server string, protocol string, ce
 		return nil, err
 	}
 	if preferCached && interval > 0 && alias != fp {
-		cachedFingerprint, err := d.cluster.ImageSourceGetCachedFingerprint(server, protocol, alias)
+		cachedFingerprint, err := d.cluster.ImageSourceGetCachedFingerprint(server, protocol, alias, imageType)
 		if err == nil && cachedFingerprint != fp {
 			fp = cachedFingerprint
 		}
@@ -251,7 +255,7 @@ func (d *Daemon) ImageDownload(op *operation, server string, protocol string, ce
 			err = d.cluster.ImageInsert(
 				project, imgInfo.Fingerprint, imgInfo.Filename, imgInfo.Size, false,
 				imgInfo.AutoUpdate, imgInfo.Architecture, imgInfo.CreatedAt, imgInfo.ExpiresAt,
-				imgInfo.Properties)
+				imgInfo.Properties, imgInfo.Type)
 			if err != nil {
 				return nil, err
 			}
@@ -425,6 +429,11 @@ func (d *Daemon) ImageDownload(op *operation, server string, protocol string, ce
 			}
 		}
 
+		// Compatibility with older LXD servers
+		if info.Type == "" {
+			info.Type = "container"
+		}
+
 		// Download the image
 		var resp *lxd.ImageFileResponse
 		request := lxd.ImageFileRequest{
@@ -517,7 +526,7 @@ func (d *Daemon) ImageDownload(op *operation, server string, protocol string, ce
 		}
 
 		// Parse the image
-		imageMeta, err := getImageMetadata(destName)
+		imageMeta, imageType, err := getImageMetadata(destName)
 		if err != nil {
 			return nil, err
 		}
@@ -529,6 +538,7 @@ func (d *Daemon) ImageDownload(op *operation, server string, protocol string, ce
 		info.CreatedAt = time.Unix(imageMeta.CreationDate, 0)
 		info.ExpiresAt = time.Unix(imageMeta.ExpiryDate, 0)
 		info.Properties = imageMeta.Properties
+		info.Type = imageType
 	} else {
 		return nil, fmt.Errorf("Unsupported protocol: %v", protocol)
 	}
@@ -544,7 +554,7 @@ func (d *Daemon) ImageDownload(op *operation, server string, protocol string, ce
 	}
 
 	// Create the database entry
-	err = d.cluster.ImageInsert(project, info.Fingerprint, info.Filename, info.Size, info.Public, info.AutoUpdate, info.Architecture, info.CreatedAt, info.ExpiresAt, info.Properties)
+	err = d.cluster.ImageInsert(project, info.Fingerprint, info.Filename, info.Size, info.Public, info.AutoUpdate, info.Architecture, info.CreatedAt, info.ExpiresAt, info.Properties, info.Type)
 	if err != nil {
 		return nil, err
 	}
diff --git a/lxd/db/images.go b/lxd/db/images.go
index 077aab8543..7d6059fcfc 100644
--- a/lxd/db/images.go
+++ b/lxd/db/images.go
@@ -11,14 +11,19 @@ import (
 	"github.com/pkg/errors"
 )
 
-// ImageSourceProtocol maps image source protocol codes to human-readable
-// names.
+// ImageSourceProtocol maps image source protocol codes to human-readable names.
 var ImageSourceProtocol = map[int]string{
 	0: "lxd",
 	1: "direct",
 	2: "simplestreams",
 }
 
+// ImageType maps image types to human-readable names.
+var ImageType = map[int]string{
+	0: "container",
+	1: "virtual-machine",
+}
+
 // ImagesGet returns the names of all images (optionally only the public ones).
 func (c *Cluster) ImagesGet(project string, public bool) ([]string, error) {
 	err := c.Transaction(func(tx *ClusterTx) error {
@@ -155,7 +160,15 @@ func (c *Cluster) ImageSourceGet(imageID int) (int, api.ImageSource, error) {
 // ImageSourceGetCachedFingerprint tries to find a source entry of a locally
 // cached image that matches the given remote details (server, protocol and
 // alias). Return the fingerprint linked to the matching entry, if any.
-func (c *Cluster) ImageSourceGetCachedFingerprint(server string, protocol string, alias string) (string, error) {
+func (c *Cluster) ImageSourceGetCachedFingerprint(server string, protocol string, alias string, typeName string) (string, error) {
+	imageType := -1
+	for k, v := range ImageType {
+		if v == typeName {
+			imageType = k
+			break
+		}
+	}
+
 	protocolInt := -1
 	for protoInt, protoString := range ImageSourceProtocol {
 		if protoString == protocol {
@@ -171,12 +184,18 @@ func (c *Cluster) ImageSourceGetCachedFingerprint(server string, protocol string
 			FROM images_source
 			INNER JOIN images
 			ON images_source.image_id=images.id
-			WHERE server=? AND protocol=? AND alias=? AND auto_update=1
-			ORDER BY creation_date DESC`
+			WHERE server=? AND protocol=? AND alias=? AND auto_update=1`
+
+	arg1 := []interface{}{server, protocolInt, alias}
+	if imageType > 0 {
+		q += "AND images.type=?"
+		arg1 = []interface{}{server, protocolInt, alias, imageType}
+	}
+
+	q += "ORDER BY creation_date DESC"
 
 	fingerprint := ""
 
-	arg1 := []interface{}{server, protocolInt, alias}
 	arg2 := []interface{}{&fingerprint}
 	err := dbQueryRowScan(c.db, q, arg1, arg2)
 	if err != nil {
@@ -283,17 +302,18 @@ func (c *Cluster) ImageGet(project, fingerprint string, public bool, strictMatch
 	image := api.Image{}
 	id := -1
 	arch := -1
+	imageType := -1
 
 	// These two humongous things will be filled by the call to DbQueryRowScan
 	outfmt := []interface{}{&id, &image.Fingerprint, &image.Filename,
 		&image.Size, &image.Cached, &image.Public, &image.AutoUpdate, &arch,
-		&create, &expire, &used, &upload}
+		&create, &expire, &used, &upload, &imageType}
 
 	inargs := []interface{}{project}
 	query := `
         SELECT
             images.id, fingerprint, filename, size, cached, public, auto_update, architecture,
-            creation_date, expiry_date, last_use_date, upload_date
+            creation_date, expiry_date, last_use_date, upload_date, type
         FROM images
         JOIN projects ON projects.id = images.project_id
        WHERE projects.name = ?`
@@ -340,7 +360,7 @@ SELECT COUNT(images.id)
 		}
 	}
 
-	err = c.imageFill(id, &image, create, expire, used, upload, arch)
+	err = c.imageFill(id, &image, create, expire, used, upload, arch, imageType)
 	if err != nil {
 		return -1, nil, errors.Wrapf(err, "Fill image details")
 	}
@@ -357,17 +377,18 @@ func (c *Cluster) ImageGetFromAnyProject(fingerprint string) (int, *api.Image, e
 	image := api.Image{}
 	id := -1
 	arch := -1
+	imageType := -1
 
 	// These two humongous things will be filled by the call to DbQueryRowScan
 	outfmt := []interface{}{&id, &image.Fingerprint, &image.Filename,
 		&image.Size, &image.Cached, &image.Public, &image.AutoUpdate, &arch,
-		&create, &expire, &used, &upload}
+		&create, &expire, &used, &upload, &imageType}
 
 	inargs := []interface{}{fingerprint}
 	query := `
         SELECT
             images.id, fingerprint, filename, size, cached, public, auto_update, architecture,
-            creation_date, expiry_date, last_use_date, upload_date
+            creation_date, expiry_date, last_use_date, upload_date, type
         FROM images
         WHERE fingerprint = ?
         LIMIT 1`
@@ -381,7 +402,7 @@ func (c *Cluster) ImageGetFromAnyProject(fingerprint string) (int, *api.Image, e
 		return -1, nil, err // Likely: there are no rows for this fingerprint
 	}
 
-	err = c.imageFill(id, &image, create, expire, used, upload, arch)
+	err = c.imageFill(id, &image, create, expire, used, upload, arch, imageType)
 	if err != nil {
 		return -1, nil, errors.Wrapf(err, "Fill image details")
 	}
@@ -391,7 +412,7 @@ func (c *Cluster) ImageGetFromAnyProject(fingerprint string) (int, *api.Image, e
 
 // Fill extra image fields such as properties and alias. This is called after
 // fetching a single row from the images table.
-func (c *Cluster) imageFill(id int, image *api.Image, create, expire, used, upload *time.Time, arch int) error {
+func (c *Cluster) imageFill(id int, image *api.Image, create, expire, used, upload *time.Time, arch int, imageType int) error {
 	// Some of the dates can be nil in the DB, let's process them.
 	if create != nil {
 		image.CreatedAt = *create
@@ -412,6 +433,7 @@ func (c *Cluster) imageFill(id int, image *api.Image, create, expire, used, uplo
 	}
 
 	image.Architecture, _ = osarch.ArchitectureName(arch)
+	image.Type = ImageType[imageType]
 
 	// The upload date is enforced by NOT NULL in the schema, so it can never be nil.
 	image.UploadedAt = *upload
@@ -599,7 +621,7 @@ func (c *Cluster) ImageAliasGet(project, name string, isTrustedClient bool) (int
 		return id, entry, err
 	}
 
-	q := `SELECT images_aliases.id, images.fingerprint, images_aliases.description
+	q := `SELECT images_aliases.id, images.fingerprint, images.type, images_aliases.description
 			 FROM images_aliases
 			 INNER JOIN images
 			 ON images_aliases.image_id=images.id
@@ -611,9 +633,10 @@ func (c *Cluster) ImageAliasGet(project, name string, isTrustedClient bool) (int
 	}
 
 	var fingerprint, description string
+	var imageType int
 
 	arg1 := []interface{}{project, name}
-	arg2 := []interface{}{&id, &fingerprint, &description}
+	arg2 := []interface{}{&id, &fingerprint, &imageType, &description}
 	err = dbQueryRowScan(c.db, q, arg1, arg2)
 	if err != nil {
 		if err == sql.ErrNoRows {
@@ -626,6 +649,7 @@ func (c *Cluster) ImageAliasGet(project, name string, isTrustedClient bool) (int
 	entry.Name = name
 	entry.Target = fingerprint
 	entry.Description = description
+	entry.Type = ImageType[imageType]
 
 	return id, entry, nil
 }
@@ -765,7 +789,7 @@ func (c *Cluster) ImageUpdate(id int, fname string, sz int64, public bool, autoU
 }
 
 // ImageInsert inserts a new image.
-func (c *Cluster) ImageInsert(project, fp string, fname string, sz int64, public bool, autoUpdate bool, architecture string, createdAt time.Time, expiresAt time.Time, properties map[string]string) error {
+func (c *Cluster) ImageInsert(project, fp string, fname string, sz int64, public bool, autoUpdate bool, architecture string, createdAt time.Time, expiresAt time.Time, properties map[string]string, typeName string) error {
 	err := c.Transaction(func(tx *ClusterTx) error {
 		enabled, err := tx.ProjectHasImages(project)
 		if err != nil {
@@ -785,6 +809,18 @@ func (c *Cluster) ImageInsert(project, fp string, fname string, sz int64, public
 		arch = 0
 	}
 
+	imageType := -1
+	for k, v := range ImageType {
+		if v == typeName {
+			imageType = k
+			break
+		}
+	}
+
+	if imageType == -1 {
+		return fmt.Errorf("Invalid image type: %v", typeName)
+	}
+
 	err = c.Transaction(func(tx *ClusterTx) error {
 		publicInt := 0
 		if public {
@@ -796,13 +832,13 @@ func (c *Cluster) ImageInsert(project, fp string, fname string, sz int64, public
 			autoUpdateInt = 1
 		}
 
-		stmt, err := tx.tx.Prepare(`INSERT INTO images (project_id, fingerprint, filename, size, public, auto_update, architecture, creation_date, expiry_date, upload_date) VALUES ((SELECT id FROM projects WHERE name = ?), ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+		stmt, err := tx.tx.Prepare(`INSERT INTO images (project_id, fingerprint, filename, size, public, auto_update, architecture, creation_date, expiry_date, upload_date, type) VALUES ((SELECT id FROM projects WHERE name = ?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
 		if err != nil {
 			return err
 		}
 		defer stmt.Close()
 
-		result, err := stmt.Exec(project, fp, fname, sz, publicInt, autoUpdateInt, arch, createdAt, expiresAt, time.Now().UTC())
+		result, err := stmt.Exec(project, fp, fname, sz, publicInt, autoUpdateInt, arch, createdAt, expiresAt, time.Now().UTC(), imageType)
 		if err != nil {
 			return err
 		}
diff --git a/lxd/images.go b/lxd/images.go
index 383ae47643..e1db1af100 100644
--- a/lxd/images.go
+++ b/lxd/images.go
@@ -156,6 +156,7 @@ func compressFile(compress string, infile io.Reader, outfile io.Writer) error {
  */
 func imgPostContInfo(d *Daemon, r *http.Request, req api.ImagesPost, op *operation, builddir string) (*api.Image, error) {
 	info := api.Image{}
+	info.Type = "container"
 	info.Properties = map[string]string{}
 	project := projectParam(r)
 	name := req.Source.Name
@@ -306,7 +307,7 @@ func imgPostContInfo(d *Daemon, r *http.Request, req api.ImagesPost, op *operati
 	info.Properties = req.Properties
 
 	// Create the database entry
-	err = d.cluster.ImageInsert(c.Project(), info.Fingerprint, info.Filename, info.Size, info.Public, info.AutoUpdate, info.Architecture, info.CreatedAt, info.ExpiresAt, info.Properties)
+	err = d.cluster.ImageInsert(c.Project(), info.Fingerprint, info.Filename, info.Size, info.Public, info.AutoUpdate, info.Architecture, info.CreatedAt, info.ExpiresAt, info.Properties, info.Type)
 	if err != nil {
 		return nil, err
 	}
@@ -326,7 +327,7 @@ func imgPostRemoteInfo(d *Daemon, req api.ImagesPost, op *operation, project str
 		return nil, fmt.Errorf("must specify one of alias or fingerprint for init from image")
 	}
 
-	info, err := d.ImageDownload(op, req.Source.Server, req.Source.Protocol, req.Source.Certificate, req.Source.Secret, hash, false, req.AutoUpdate, "", false, project)
+	info, err := d.ImageDownload(op, req.Source.Server, req.Source.Protocol, req.Source.Certificate, req.Source.Secret, hash, req.Source.ImageType, false, req.AutoUpdate, "", false, project)
 	if err != nil {
 		return nil, err
 	}
@@ -395,7 +396,7 @@ func imgPostURLInfo(d *Daemon, req api.ImagesPost, op *operation, project string
 	}
 
 	// Import the image
-	info, err := d.ImageDownload(op, url, "direct", "", "", hash, false, req.AutoUpdate, "", false, project)
+	info, err := d.ImageDownload(op, url, "direct", "", "", hash, "", false, req.AutoUpdate, "", false, project)
 	if err != nil {
 		return nil, err
 	}
@@ -473,9 +474,12 @@ func getImgPostInfo(d *Daemon, r *http.Request, builddir string, project string,
 			return nil, err
 		}
 
-		if part.FormName() != "rootfs" {
+		if part.FormName() == "rootfs" {
+			info.Type = "container"
+		} else if part.FormName() == "rootfs.img" {
+			info.Type = "virtual-machine"
+		} else {
 			logger.Error("Invalid multipart image")
-
 			return nil, fmt.Errorf("Invalid multipart image")
 		}
 
@@ -504,7 +508,7 @@ func getImgPostInfo(d *Daemon, r *http.Request, builddir string, project string,
 			return nil, err
 		}
 
-		imageMeta, err = getImageMetadata(imageTarf.Name())
+		imageMeta, _, err = getImageMetadata(imageTarf.Name())
 		if err != nil {
 			logger.Error("Failed to get image metadata", log.Ctx{"err": err})
 			return nil, err
@@ -532,12 +536,11 @@ func getImgPostInfo(d *Daemon, r *http.Request, builddir string, project string,
 	} else {
 		post.Seek(0, 0)
 		size, err = io.Copy(sha256, post)
-		info.Size = size
-		logger.Debug("Tar size", log.Ctx{"size": size})
 		if err != nil {
 			logger.Error("Failed to copy the tarfile", log.Ctx{"err": err})
 			return nil, err
 		}
+		info.Size = size
 
 		info.Filename = r.Header.Get("X-LXD-filename")
 		info.Fingerprint = fmt.Sprintf("%x", sha256.Sum(nil))
@@ -551,11 +554,13 @@ func getImgPostInfo(d *Daemon, r *http.Request, builddir string, project string,
 			return nil, err
 		}
 
-		imageMeta, err = getImageMetadata(post.Name())
+		var imageType string
+		imageMeta, imageType, err = getImageMetadata(post.Name())
 		if err != nil {
 			logger.Error("Failed to get image metadata", log.Ctx{"err": err})
 			return nil, err
 		}
+		info.Type = imageType
 
 		imgfname := shared.VarPath("images", info.Fingerprint)
 		err = shared.FileMove(post.Name(), imgfname)
@@ -601,7 +606,7 @@ func getImgPostInfo(d *Daemon, r *http.Request, builddir string, project string,
 		}
 	} else {
 		// Create the database entry
-		err = d.cluster.ImageInsert(project, info.Fingerprint, info.Filename, info.Size, info.Public, info.AutoUpdate, info.Architecture, info.CreatedAt, info.ExpiresAt, info.Properties)
+		err = d.cluster.ImageInsert(project, info.Fingerprint, info.Filename, info.Size, info.Public, info.AutoUpdate, info.Architecture, info.CreatedAt, info.ExpiresAt, info.Properties, info.Type)
 		if err != nil {
 			return nil, err
 		}
@@ -792,26 +797,26 @@ func imagesPost(d *Daemon, r *http.Request) Response {
 	return OperationResponse(op)
 }
 
-func getImageMetadata(fname string) (*api.ImageMetadata, error) {
+func getImageMetadata(fname string) (*api.ImageMetadata, string, error) {
 	var tr *tar.Reader
 	var result api.ImageMetadata
 
 	// Open the file
 	r, err := os.Open(fname)
 	if err != nil {
-		return nil, err
+		return nil, "unknown", err
 	}
 	defer r.Close()
 
 	// Decompress if needed
 	_, _, unpacker, err := shared.DetectCompressionFile(r)
 	if err != nil {
-		return nil, err
+		return nil, "unknown", err
 	}
 	r.Seek(0, 0)
 
 	if unpacker == nil {
-		return nil, fmt.Errorf("Unsupported backup compression")
+		return nil, "unknown", fmt.Errorf("Unsupported backup compression")
 	}
 
 	// Open the tarball
@@ -821,13 +826,13 @@ func getImageMetadata(fname string) (*api.ImageMetadata, error) {
 
 		stdout, err := cmd.StdoutPipe()
 		if err != nil {
-			return nil, err
+			return nil, "unknown", err
 		}
 		defer stdout.Close()
 
 		err = cmd.Start()
 		if err != nil {
-			return nil, err
+			return nil, "unknown", err
 		}
 		defer cmd.Wait()
 
@@ -841,40 +846,56 @@ func getImageMetadata(fname string) (*api.ImageMetadata, error) {
 
 	// Parse the content
 	hasMeta := false
+	hasRoot := false
+	imageType := "unknown"
 	for {
 		hdr, err := tr.Next()
 		if err == io.EOF {
 			break // End of archive
 		}
 		if err != nil {
-			return nil, err
+			return nil, "unknown", err
 		}
 
 		if hdr.Name == "metadata.yaml" || hdr.Name == "./metadata.yaml" {
 			err = yaml.NewDecoder(tr).Decode(&result)
 			if err != nil {
-				return nil, err
+				return nil, "unknown", err
 			}
 
 			hasMeta = true
+		}
+
+		if strings.HasPrefix(hdr.Name, "rootfs/") || strings.HasPrefix(hdr.Name, "./rootfs/") {
+			hasRoot = true
+			imageType = "container"
+		}
+
+		if hdr.Name == "rootfs.img" || hdr.Name == "./rootfs.img" {
+			hasRoot = true
+			imageType = "virtual-machine"
+		}
+
+		if hasMeta && hasRoot {
+			// Done with the bits we want, no need to keep reading
 			break
 		}
 	}
 
 	if !hasMeta {
-		return nil, fmt.Errorf("Metadata tarball is missing metadata.yaml")
+		return nil, "unknown", fmt.Errorf("Metadata tarball is missing metadata.yaml")
 	}
 
 	_, err = osarch.ArchitectureId(result.Architecture)
 	if err != nil {
-		return nil, err
+		return nil, "unknown", err
 	}
 
 	if result.CreationDate == 0 {
-		return nil, fmt.Errorf("Missing creation date")
+		return nil, "unknown", fmt.Errorf("Missing creation date")
 	}
 
-	return &result, nil
+	return &result, imageType, nil
 }
 
 func doImagesGet(d *Daemon, recursion bool, project string, public bool) (interface{}, error) {
@@ -1065,7 +1086,7 @@ func autoUpdateImage(d *Daemon, op *operation, id int, info *api.Image, project
 	// Update the image on each pool where it currently exists.
 	hash := fingerprint
 	for _, poolName := range poolNames {
-		newInfo, err := d.ImageDownload(op, source.Server, source.Protocol, source.Certificate, "", source.Alias, false, true, poolName, false, project)
+		newInfo, err := d.ImageDownload(op, source.Server, source.Protocol, source.Certificate, "", source.Alias, source.Type, false, true, poolName, false, project)
 
 		if err != nil {
 			logger.Error("Failed to update the image", log.Ctx{"err": err, "fp": fingerprint})

From 1b5aa6f498fc230e5e55ed9e824db1d28620f9c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 23 Aug 2019 14:24:57 -0700
Subject: [PATCH 10/13] lxc/image: Show image types
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/image.go | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/lxc/image.go b/lxc/image.go
index 538a8775f6..c88a812f88 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -834,9 +834,15 @@ func (c *cmdImageInfo) Run(cmd *cobra.Command, args []string) error {
 		autoUpdate = i18n.G("enabled")
 	}
 
+	imgType := "container"
+	if info.Type != "" {
+		imgType = info.Type
+	}
+
 	fmt.Printf(i18n.G("Fingerprint: %s")+"\n", info.Fingerprint)
 	fmt.Printf(i18n.G("Size: %.2fMB")+"\n", float64(info.Size)/1024.0/1024.0)
 	fmt.Printf(i18n.G("Architecture: %s")+"\n", info.Architecture)
+	fmt.Printf(i18n.G("Type: %s")+"\n", imgType)
 	fmt.Printf(i18n.G("Public: %s")+"\n", public)
 	fmt.Printf(i18n.G("Timestamps:") + "\n")
 
@@ -922,9 +928,10 @@ Column shorthand chars:
     d - Description
     a - Architecture
     s - Size
-    u - Upload date`))
+    u - Upload date
+    t - Type`))
 
-	cmd.Flags().StringVarP(&c.flagColumns, "columns", "c", "lfpdasu", i18n.G("Columns")+"``")
+	cmd.Flags().StringVarP(&c.flagColumns, "columns", "c", "lfpdatsu", i18n.G("Columns")+"``")
 	cmd.Flags().StringVar(&c.flagFormat, "format", "table", i18n.G("Format (csv|json|table|yaml)")+"``")
 	cmd.RunE = c.Run
 
@@ -942,6 +949,7 @@ func (c *cmdImageList) parseColumns() ([]imageColumn, error) {
 		'a': {i18n.G("ARCH"), c.architectureColumnData},
 		's': {i18n.G("SIZE"), c.sizeColumnData},
 		'u': {i18n.G("UPLOAD DATE"), c.uploadDateColumnData},
+		't': {i18n.G("TYPE"), c.typeColumnData},
 	}
 
 	columnList := strings.Split(c.flagColumns, ",")
@@ -1009,6 +1017,14 @@ func (c *cmdImageList) sizeColumnData(image api.Image) string {
 	return fmt.Sprintf("%.2fMB", float64(image.Size)/1024.0/1024.0)
 }
 
+func (c *cmdImageList) typeColumnData(image api.Image) string {
+	if image.Type == "" {
+		return "CONTAINER"
+	}
+
+	return strings.ToUpper(image.Type)
+}
+
 func (c *cmdImageList) uploadDateColumnData(image api.Image) string {
 	return image.UploadedAt.UTC().Format("Jan 2, 2006 at 3:04pm (MST)")
 }

From a5f7c1e1104eb4e1fb93f2745b7009aa529b9202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 3 Sep 2019 20:08:45 -0400
Subject: [PATCH 11/13] lxc/image: Show alias types
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/image_alias.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lxc/image_alias.go b/lxc/image_alias.go
index a5db3656bc..546e288deb 100644
--- a/lxc/image_alias.go
+++ b/lxc/image_alias.go
@@ -218,13 +218,18 @@ func (c *cmdImageAliasList) Run(cmd *cobra.Command, args []string) error {
 			continue
 		}
 
-		data = append(data, []string{alias.Name, alias.Target[0:12], alias.Description})
+		if alias.Type == "" {
+			alias.Type = "container"
+		}
+
+		data = append(data, []string{alias.Name, alias.Target[0:12], strings.ToUpper(alias.Type), alias.Description})
 	}
 	sort.Sort(stringList(data))
 
 	header := []string{
 		i18n.G("ALIAS"),
 		i18n.G("FINGERPRINT"),
+		i18n.G("TYPE"),
 		i18n.G("DESCRIPTION"),
 	}
 

From 1dc569bcc019aa990bb2bab7e09e68b6041db2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 5 Sep 2019 17:05:13 -0400
Subject: [PATCH 12/13] lxc: Add --vm to image commands
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/image.go | 51 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/lxc/image.go b/lxc/image.go
index c88a812f88..af95c098e2 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -95,12 +95,12 @@ hash or alias name (if one is set).`))
 	return cmd
 }
 
-func (c *cmdImage) dereferenceAlias(d lxd.ImageServer, inName string) string {
+func (c *cmdImage) dereferenceAlias(d lxd.ImageServer, imageType string, inName string) string {
 	if inName == "" {
 		inName = "default"
 	}
 
-	result, _, _ := d.GetImageAlias(inName)
+	result, _, _ := d.GetImageAliasType(imageType, inName)
 	if result == nil {
 		return inName
 	}
@@ -117,6 +117,7 @@ type cmdImageCopy struct {
 	flagPublic      bool
 	flagCopyAliases bool
 	flagAutoUpdate  bool
+	flagVM          bool
 }
 
 func (c *cmdImageCopy) Command() *cobra.Command {
@@ -134,6 +135,7 @@ It requires the source to be an alias and for it to be public.`))
 	cmd.Flags().BoolVar(&c.flagCopyAliases, "copy-aliases", false, i18n.G("Copy aliases from source"))
 	cmd.Flags().BoolVar(&c.flagAutoUpdate, "auto-update", false, i18n.G("Keep the image up to date after initial copy"))
 	cmd.Flags().StringArrayVar(&c.flagAliases, "alias", nil, i18n.G("New aliases to add to the image")+"``")
+	cmd.Flags().BoolVar(&c.flagVM, "vm", false, i18n.G("Copy virtual machine images"))
 	cmd.RunE = c.Run
 
 	return cmd
@@ -171,6 +173,12 @@ func (c *cmdImageCopy) Run(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf(i18n.G("Can't provide a name for the target image"))
 	}
 
+	// Resolve image type
+	imageType := ""
+	if c.flagVM {
+		imageType = "virtual-machine"
+	}
+
 	// Copy the image
 	var imgInfo *api.Image
 	var fp string
@@ -183,7 +191,7 @@ func (c *cmdImageCopy) Run(cmd *cobra.Command, args []string) error {
 		imgInfo.Public = true
 	} else {
 		// Resolve any alias and then grab the image information from the source
-		image := c.image.dereferenceAlias(sourceServer, name)
+		image := c.image.dereferenceAlias(sourceServer, imageType, name)
 		imgInfo, _, err = sourceServer.GetImage(image)
 		if err != nil {
 			return err
@@ -201,6 +209,7 @@ func (c *cmdImageCopy) Run(cmd *cobra.Command, args []string) error {
 	copyArgs := lxd.ImageCopyArgs{
 		AutoUpdate: c.flagAutoUpdate,
 		Public:     c.flagPublic,
+		Type:       imageType,
 	}
 
 	// Do the copy
@@ -284,7 +293,7 @@ func (c *cmdImageDelete) Run(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf(i18n.G("Image identifier missing"))
 		}
 
-		image := c.image.dereferenceAlias(resource.server, resource.name)
+		image := c.image.dereferenceAlias(resource.server, "", resource.name)
 		op, err := resource.server.DeleteImage(image)
 		if err != nil {
 			return err
@@ -353,7 +362,7 @@ func (c *cmdImageEdit) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Resolve any aliases
-	image := c.image.dereferenceAlias(resource.server, resource.name)
+	image := c.image.dereferenceAlias(resource.server, "", resource.name)
 	if image == "" {
 		image = resource.name
 	}
@@ -426,6 +435,8 @@ func (c *cmdImageEdit) Run(cmd *cobra.Command, args []string) error {
 type cmdImageExport struct {
 	global *cmdGlobal
 	image  *cmdImage
+
+	flagVM bool
 }
 
 func (c *cmdImageExport) Command() *cobra.Command {
@@ -437,6 +448,7 @@ func (c *cmdImageExport) Command() *cobra.Command {
 
 The output target is optional and defaults to the working directory.`))
 
+	cmd.Flags().BoolVar(&c.flagVM, "vm", false, i18n.G("Query virtual machine images"))
 	cmd.RunE = c.Run
 
 	return cmd
@@ -461,7 +473,12 @@ func (c *cmdImageExport) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Resolve aliases
-	fingerprint := c.image.dereferenceAlias(remoteServer, name)
+	imageType := ""
+	if c.flagVM {
+		imageType = "virtual-machine"
+	}
+
+	fingerprint := c.image.dereferenceAlias(remoteServer, imageType, name)
 
 	// Default target is current directory
 	target := "."
@@ -780,6 +797,8 @@ func (c *cmdImageImport) Run(cmd *cobra.Command, args []string) error {
 type cmdImageInfo struct {
 	global *cmdGlobal
 	image  *cmdImage
+
+	flagVM bool
 }
 
 func (c *cmdImageInfo) Command() *cobra.Command {
@@ -789,6 +808,7 @@ func (c *cmdImageInfo) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show useful information about images`))
 
+	cmd.Flags().BoolVar(&c.flagVM, "vm", false, i18n.G("Query virtual machine images"))
 	cmd.RunE = c.Run
 
 	return cmd
@@ -813,7 +833,12 @@ func (c *cmdImageInfo) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Render info
-	image := c.image.dereferenceAlias(remoteServer, name)
+	imageType := ""
+	if c.flagVM {
+		imageType = "virtual-machine"
+	}
+
+	image := c.image.dereferenceAlias(remoteServer, imageType, name)
 	info, _, err := remoteServer.GetImage(image)
 	if err != nil {
 		return err
@@ -1230,7 +1255,7 @@ func (c *cmdImageRefresh) Run(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf(i18n.G("Image identifier missing"))
 		}
 
-		image := c.image.dereferenceAlias(resource.server, resource.name)
+		image := c.image.dereferenceAlias(resource.server, "", resource.name)
 		progress := utils.ProgressRenderer{
 			Format: i18n.G("Refreshing the image: %s"),
 			Quiet:  c.global.flagQuiet,
@@ -1275,6 +1300,8 @@ func (c *cmdImageRefresh) Run(cmd *cobra.Command, args []string) error {
 type cmdImageShow struct {
 	global *cmdGlobal
 	image  *cmdImage
+
+	flagVM bool
 }
 
 func (c *cmdImageShow) Command() *cobra.Command {
@@ -1284,6 +1311,7 @@ func (c *cmdImageShow) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show image properties`))
 
+	cmd.Flags().BoolVar(&c.flagVM, "vm", false, i18n.G("Query virtual machine images"))
 	cmd.RunE = c.Run
 
 	return cmd
@@ -1308,7 +1336,12 @@ func (c *cmdImageShow) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Show properties
-	image := c.image.dereferenceAlias(remoteServer, name)
+	imageType := ""
+	if c.flagVM {
+		imageType = "virtual-machine"
+	}
+
+	image := c.image.dereferenceAlias(remoteServer, imageType, name)
 	info, _, err := remoteServer.GetImage(image)
 	if err != nil {
 		return err

From 812ca1eb0b12c8bace8b64e6a16728582557651e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 23 Aug 2019 14:25:19 -0700
Subject: [PATCH 13/13] 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      | 197 +++++++++++++++++++++++++------------------------
 po/de.po      | 197 +++++++++++++++++++++++++------------------------
 po/el.po      | 197 +++++++++++++++++++++++++------------------------
 po/es.po      | 198 +++++++++++++++++++++++++------------------------
 po/fa.po      | 197 +++++++++++++++++++++++++------------------------
 po/fi.po      | 197 +++++++++++++++++++++++++------------------------
 po/fr.po      | 198 +++++++++++++++++++++++++------------------------
 po/hi.po      | 197 +++++++++++++++++++++++++------------------------
 po/id.po      | 197 +++++++++++++++++++++++++------------------------
 po/it.po      | 197 +++++++++++++++++++++++++------------------------
 po/ja.po      | 199 ++++++++++++++++++++++++++------------------------
 po/ko.po      | 197 +++++++++++++++++++++++++------------------------
 po/lxd.pot    | 183 ++++++++++++++++++++++++----------------------
 po/nb_NO.po   | 197 +++++++++++++++++++++++++------------------------
 po/nl.po      | 197 +++++++++++++++++++++++++------------------------
 po/pa.po      | 197 +++++++++++++++++++++++++------------------------
 po/pl.po      | 197 +++++++++++++++++++++++++------------------------
 po/pt_BR.po   | 198 +++++++++++++++++++++++++------------------------
 po/ru.po      | 198 +++++++++++++++++++++++++------------------------
 po/sr.po      | 197 +++++++++++++++++++++++++------------------------
 po/sv.po      | 197 +++++++++++++++++++++++++------------------------
 po/te.po      | 197 +++++++++++++++++++++++++------------------------
 po/tr.po      | 197 +++++++++++++++++++++++++------------------------
 po/uk.po      | 197 +++++++++++++++++++++++++------------------------
 po/zh_Hans.po | 197 +++++++++++++++++++++++++------------------------
 25 files changed, 2574 insertions(+), 2343 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 57256ff447..7f39620f68 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index c38b148d5d..88e8e202fb 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: 2018-11-30 03:10+0000\n"
 "Last-Translator: ssantos <ssantos at web.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -160,7 +160,7 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -293,7 +293,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (%d mehr)"
@@ -349,15 +349,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -431,16 +431,16 @@ msgstr "entfernte Instanz %s existiert bereits"
 msgid "Alias %s doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 #, fuzzy
 msgid "Aliases:"
 msgstr "Aliasse:\n"
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, fuzzy, c-format
 msgid "Architecture: %s"
 msgstr "Architektur: %s\n"
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr "automatisches Update: %s"
@@ -522,7 +522,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, fuzzy, c-format
 msgid "Bad property: %s"
 msgstr "Ungültige Abbild Eigenschaft: %s\n"
@@ -590,7 +590,7 @@ msgstr "ERSTELLT AM"
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, fuzzy, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -612,7 +612,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -701,7 +701,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr "Spalten"
 
@@ -733,7 +733,7 @@ msgid "Config key/value to apply to the target container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, fuzzy, c-format
 msgid "Config parsing error: %s"
@@ -766,7 +766,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "Kopiere Aliasse von der Quelle"
 
@@ -775,11 +775,11 @@ msgstr "Kopiere Aliasse von der Quelle"
 msgid "Copy containers within or in between LXD instances"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -814,7 +814,11 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -907,7 +911,7 @@ msgstr "Anhalten des Containers fehlgeschlagen!"
 msgid "Create the container with no profiles applied"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr "Erstellt: %s"
@@ -931,7 +935,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
@@ -970,7 +974,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -1012,11 +1016,11 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -1099,7 +1103,7 @@ msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 "Falsche Anzahl an Objekten im Abbild, Container oder Sicherungspunkt gelesen."
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -1176,7 +1180,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1200,7 +1204,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1264,20 +1268,20 @@ msgstr ""
 "\n"
 "lxc exec <Container> [--env EDITOR=/usr/bin/vim]... <Befehl>\n"
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1299,7 +1303,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Exporting the backup: %s"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1308,8 +1312,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr "FINGERABDRUCK"
 
@@ -1349,7 +1353,7 @@ msgstr ""
 "Anzeigen von Informationen über entfernte Instanzen wird noch nicht "
 "unterstützt\n"
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, fuzzy, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerabdruck: %s\n"
@@ -1400,7 +1404,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1537,33 +1541,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, fuzzy, c-format
 msgid "Image identifier missing: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, fuzzy, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1576,14 +1580,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1683,7 +1687,7 @@ msgstr ""
 "Optionen:\n"
 "\n"
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1704,12 +1708,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1854,11 +1858,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1881,7 +1885,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1949,7 +1954,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr "Veröffentliche Abbild"
 
@@ -2217,7 +2222,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Moving the storage volume: %s"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2306,7 +2311,7 @@ msgstr "Profil %s erstellt\n"
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2355,7 +2360,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2401,7 +2406,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2451,7 +2456,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2551,7 +2556,7 @@ msgstr "Profil %s gelöscht\n"
 msgid "Project %s renamed to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 #, fuzzy
 msgid "Properties:"
 msgstr "Eigenschaften:\n"
@@ -2560,7 +2565,7 @@ msgstr "Eigenschaften:\n"
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, fuzzy, c-format
 msgid "Public: %s"
 msgstr "Öffentlich: %s\n"
@@ -2595,6 +2600,10 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2604,7 +2613,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2613,7 +2622,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2694,8 +2703,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2793,7 +2802,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -3002,7 +3011,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -3064,7 +3073,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -3072,7 +3081,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, fuzzy, c-format
 msgid "Size: %.2fMB"
 msgstr "Größe: %.2vMB\n"
@@ -3101,7 +3110,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -3218,8 +3227,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3315,7 +3324,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "Wartezeit bevor der Container gestoppt wird."
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 #, fuzzy
 msgid "Timestamps:"
 msgstr "Zeitstempel:\n"
@@ -3368,7 +3377,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3378,7 +3387,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3391,7 +3400,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3414,7 +3423,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3459,7 +3468,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr "Alternatives config Verzeichnis."
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3626,7 +3635,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3701,7 +3710,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 #, fuzzy
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -3765,7 +3774,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3785,7 +3794,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3827,7 +3836,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3855,7 +3864,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3908,7 +3917,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3922,7 +3931,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3959,7 +3968,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -4045,7 +4054,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -4236,7 +4245,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -4306,7 +4315,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 #, fuzzy
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -4350,7 +4359,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4479,7 +4488,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4647,8 +4656,8 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 591f2af51f..fa5688841b 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\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/"
@@ -95,7 +95,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -168,7 +168,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -224,15 +224,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -304,15 +304,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -368,7 +368,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -392,7 +392,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -459,7 +459,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -556,7 +556,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -585,7 +585,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -618,7 +618,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -626,11 +626,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -662,7 +662,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -745,7 +749,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -768,7 +772,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -805,7 +809,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -845,11 +849,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -926,7 +930,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -1001,7 +1005,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1025,7 +1029,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1085,20 +1089,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1118,7 +1122,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1127,8 +1131,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1163,7 +1167,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1213,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1347,33 +1351,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1385,14 +1389,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1486,7 +1490,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1507,12 +1511,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1638,11 +1642,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1665,7 +1669,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1728,7 +1733,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1977,7 +1982,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2065,7 +2070,7 @@ msgstr "  Χρήση δικτύου:"
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2111,7 +2116,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2157,7 +2162,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2206,7 +2211,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2304,7 +2309,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2312,7 +2317,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2344,6 +2349,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2353,7 +2362,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2362,7 +2371,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2439,8 +2448,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2529,7 +2538,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2730,7 +2739,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2790,7 +2799,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2798,7 +2807,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2826,7 +2835,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2937,8 +2946,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3028,7 +3037,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3090,7 +3099,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3103,7 +3112,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3126,7 +3135,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3168,7 +3177,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3324,7 +3333,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3390,7 +3399,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3442,7 +3451,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3462,7 +3471,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3494,7 +3503,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3518,7 +3527,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3562,7 +3571,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3576,7 +3585,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3609,7 +3618,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3695,7 +3704,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3877,7 +3886,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3931,7 +3940,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3971,7 +3980,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4057,7 +4066,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4198,7 +4207,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 7789ac80c0..851f529f29 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: 2019-06-13 16:56+0000\n"
 "Last-Translator: Alonso José Lara Plana <alonso.lara.plana at gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -146,7 +146,7 @@ msgstr ""
 "###     template: template.tpl\n"
 "###     properties: {}"
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -240,7 +240,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (%d más)"
@@ -296,15 +296,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -377,15 +377,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr "Aliases:"
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr "Arquitectura: %s"
@@ -441,7 +441,7 @@ msgstr "Tipo de autenticación %s no está soportada por el servidor"
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr "Auto actualización: %s"
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr "Propiedad mala: %s"
@@ -531,7 +531,7 @@ msgstr "CREADO EN"
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr "Cacheado: %s"
@@ -545,7 +545,7 @@ msgstr "Cacheado: %s"
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -631,7 +631,7 @@ msgstr "Nombre del Miembro del Cluster"
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr "Columnas"
 
@@ -660,7 +660,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -701,11 +701,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -737,7 +737,12 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+#, fuzzy
+msgid "Copy virtual machine images"
+msgstr "Copiando la imagen: %s"
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Copiando la imagen: %s"
@@ -823,7 +828,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr "Creado: %s"
@@ -846,7 +851,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr "DESCRIPCIÓN"
@@ -883,7 +888,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -923,11 +928,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -1004,7 +1009,7 @@ msgstr "Cacheado: %s"
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr "El directorio importado no está disponible en esta plataforma"
 
@@ -1078,7 +1083,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1102,7 +1107,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1162,20 +1167,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr "Expira: %s"
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr "Expira: nunca"
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1197,7 +1202,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "Exporting the backup: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr "Exportando la imagen: %s"
@@ -1206,8 +1211,8 @@ msgstr "Exportando la imagen: %s"
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr "HUELLA DIGITAL"
 
@@ -1242,7 +1247,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr "El filtrado no está soportado aún"
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Huella dactilar: %s"
@@ -1292,7 +1297,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1426,33 +1431,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1465,14 +1470,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1566,7 +1571,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr "Cacheado: %s"
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1587,12 +1592,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1719,11 +1724,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1746,7 +1751,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1809,7 +1815,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -2059,7 +2065,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2146,7 +2152,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2192,7 +2198,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2238,7 +2244,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2287,7 +2293,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2385,7 +2391,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2393,7 +2399,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2425,6 +2431,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2434,7 +2444,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2443,7 +2453,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2520,8 +2530,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2610,7 +2620,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2811,7 +2821,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2871,7 +2881,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2879,7 +2889,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2907,7 +2917,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -3018,8 +3028,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3109,7 +3119,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3161,7 +3171,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3171,7 +3181,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Expira: %s"
@@ -3184,7 +3194,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3207,7 +3217,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3249,7 +3259,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3406,7 +3416,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3472,7 +3482,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3524,7 +3534,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3544,7 +3554,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3577,7 +3587,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3601,7 +3611,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3645,7 +3655,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3659,7 +3669,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3692,7 +3702,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3778,7 +3788,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3960,7 +3970,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -4014,7 +4024,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -4054,7 +4064,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4141,7 +4151,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4284,8 +4294,8 @@ msgstr "Columnas"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index ff6e3012a2..d3264b0fd1 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 343cc7a08f..3c7eafe4dd 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index d5c39cddae..e2abb1dc3c 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\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/"
@@ -154,7 +154,7 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -283,7 +283,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (%d de plus)"
@@ -339,16 +339,16 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 #, fuzzy
 msgid "ALIASES"
 msgstr "ALIAS"
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr "ARCH"
 
@@ -423,15 +423,15 @@ msgstr "le serveur distant %s existe déjà"
 msgid "Alias %s doesn't exist"
 msgstr "le serveur distant %s n'existe pas"
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr "Alias :"
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architecture : %s"
@@ -488,7 +488,7 @@ msgstr "Le type d'authentification '%s' n'est pas supporté par le serveur"
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr "Mise à jour auto. : %s"
@@ -513,7 +513,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr "Mauvaise propriété : %s"
@@ -580,7 +580,7 @@ msgstr "CRÉÉ À"
 msgid "CUDA Version: %v"
 msgstr "Afficher la version du client"
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, fuzzy, c-format
 msgid "Cached: %s"
 msgstr "Créé : %s"
@@ -594,7 +594,7 @@ msgstr "Créé : %s"
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -683,7 +683,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr "Colonnes"
 
@@ -720,7 +720,7 @@ msgid "Config key/value to apply to the target container"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -753,7 +753,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "Copier les alias depuis la source"
 
@@ -762,11 +762,11 @@ msgstr "Copier les alias depuis la source"
 msgid "Copy containers within or in between LXD instances"
 msgstr "Copiez le conteneur sans ses instantanés"
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -800,7 +800,12 @@ msgstr "Copiez le conteneur sans ses instantanés"
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+#, fuzzy
+msgid "Copy virtual machine images"
+msgstr "Copie de l'image : %s"
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Copie de l'image : %s"
@@ -909,7 +914,7 @@ msgstr "Copie de l'image : %s"
 msgid "Create the container with no profiles applied"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr "Créé : %s"
@@ -932,7 +937,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -971,7 +976,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 #, fuzzy
 msgid "Delete images"
 msgstr "Récupération de l'image : %s"
@@ -1014,11 +1019,11 @@ msgstr "Copie de l'image : %s"
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -1096,7 +1101,7 @@ msgstr "Serveur distant : %s"
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr "pas d'image, conteneur ou instantané affecté sur ce serveur"
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr "L'importation de répertoire n'est pas disponible sur cette plateforme"
 
@@ -1174,7 +1179,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr "Création du conteneur"
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1199,7 +1204,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1268,21 +1273,21 @@ msgstr ""
 "sélectionné si à la fois stdin et stdout sont des terminaux (stderr\n"
 "est ignoré)."
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr "Expire : %s"
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr "N'expire jamais"
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 #, fuzzy
 msgid "Export and download images"
 msgstr "Import de l'image : %s"
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1304,7 +1309,7 @@ msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 msgid "Exporting the backup: %s"
 msgstr "Import de l'image : %s"
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, fuzzy, c-format
 msgid "Exporting the image: %s"
 msgstr "Import de l'image : %s"
@@ -1314,8 +1319,8 @@ msgstr "Import de l'image : %s"
 msgid "FILENAME"
 msgstr "NOM"
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
@@ -1353,7 +1358,7 @@ msgstr "Mode rapide (identique à --columns=nsacPt"
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Empreinte : %s"
@@ -1404,7 +1409,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1548,34 +1553,34 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 #, fuzzy
 msgid "Image exported successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, fuzzy, c-format
 msgid "Image identifier missing: %s"
 msgstr "Image importée avec l'empreinte : %s"
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Image importée avec l'empreinte : %s"
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 #, fuzzy
 msgid "Image refreshed successfully!"
 msgstr "Image copiée avec succès !"
@@ -1589,14 +1594,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 #, fuzzy
 msgid "Import images into the image store"
 msgstr "Import de l'image : %s"
@@ -1692,7 +1697,7 @@ msgstr "IPs :"
 msgid "IsSM: %s (%s)"
 msgstr "Créé : %s"
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr "Garder l'image à jour après la copie initiale"
 
@@ -1713,12 +1718,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr "Dernière utilisation : %s"
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr "Dernière utilisation : jamais"
 
@@ -1908,11 +1913,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1935,7 +1940,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1999,7 +2005,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr "Rendre l'image publique"
 
@@ -2270,7 +2276,7 @@ msgstr "Forcer le conteneur à s'arrêter"
 msgid "Moving the storage volume: %s"
 msgstr "Copie de l'image : %s"
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2358,7 +2364,7 @@ msgstr "  Réseau utilisé :"
 msgid "New alias to define at target"
 msgstr "Nouvel alias à définir sur la cible"
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 #, fuzzy
 msgid "New aliases to add to the image"
 msgstr "Nouvel alias à définir sur la cible"
@@ -2411,7 +2417,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr "Seules les URLs https sont supportées par simplestreams"
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 #, fuzzy
 msgid "Only https:// is supported for remote image import"
 msgstr "Seul https:// est supporté par l'import d'images distantes."
@@ -2460,7 +2466,7 @@ msgstr "PROFILS"
 msgid "PROTOCOL"
 msgstr "PROTOCOLE"
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr "PUBLIC"
 
@@ -2511,7 +2517,7 @@ msgid "Press enter to open the editor again"
 msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr "Appuyer sur Entrée pour lancer à nouveau l'éditeur"
 
@@ -2610,7 +2616,7 @@ msgstr "Profil %s supprimé"
 msgid "Project %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr "Propriétés :"
 
@@ -2618,7 +2624,7 @@ msgstr "Propriétés :"
 msgid "Public image server"
 msgstr "Serveur d'images public"
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr "Public : %s"
@@ -2653,6 +2659,10 @@ msgstr "Création du conteneur"
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2663,7 +2673,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr "Pousser ou récupérer des fichiers récursivement"
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 #, fuzzy
 msgid "Refresh images"
 msgstr "Récupération de l'image : %s"
@@ -2673,7 +2683,7 @@ msgstr "Récupération de l'image : %s"
 msgid "Refreshing container: %s"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "Récupération de l'image : %s"
@@ -2754,8 +2764,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2853,7 +2863,7 @@ msgstr "Récupération de l'image : %s"
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr "TAILLE"
 
@@ -3068,7 +3078,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -3136,7 +3146,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -3144,7 +3154,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "Taille : %.2f Mo"
@@ -3173,7 +3183,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr "Source :"
 
@@ -3291,8 +3301,8 @@ msgstr "impossible de supprimer le serveur distant par défaut"
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr "TYPE"
 
@@ -3390,7 +3400,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "Temps d'attente du conteneur avant de le tuer"
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr "Horodatage :"
 
@@ -3444,7 +3454,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr "Transfert de l'image : %s"
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr "Transfert de l'image : %s"
@@ -3454,7 +3464,7 @@ msgstr "Transfert de l'image : %s"
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr "Essayer `lxc info --show-log %s` pour plus d'informations"
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Expire : %s"
@@ -3467,7 +3477,7 @@ msgstr "Type : éphémère"
 msgid "Type: persistent"
 msgstr "Type : persistant"
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
@@ -3490,7 +3500,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3540,7 +3550,7 @@ msgstr "Clé de configuration invalide"
 msgid "Unset storage volume configuration keys"
 msgstr "Clé de configuration invalide"
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr "Publié : %s"
@@ -3704,7 +3714,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3783,7 +3793,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 #, fuzzy
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -3847,7 +3857,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr "désactivé"
 
@@ -3867,7 +3877,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3915,7 +3925,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr "activé"
 
@@ -3943,7 +3953,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -4000,7 +4010,7 @@ msgstr "par défaut"
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -4014,7 +4024,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -4051,7 +4061,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -4137,7 +4147,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -4350,7 +4360,7 @@ msgstr ""
 msgid "network"
 msgstr "Nom du réseau"
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr "non"
 
@@ -4427,7 +4437,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 #, fuzzy
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -4472,7 +4482,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4610,7 +4620,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4790,8 +4800,8 @@ msgstr "Colonnes"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr "oui"
 
diff --git a/po/hi.po b/po/hi.po
index 517abd2208..4e16155598 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 63fa2b5c6a..f4beee0236 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 1e5c52cabc..86183f0177 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: 2017-08-18 14:22+0000\n"
 "Last-Translator: Alberto Donato <alberto.donato at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -110,7 +110,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -205,7 +205,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (altri %d)"
@@ -261,15 +261,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr "ALIAS"
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr "ARCH"
 
@@ -342,15 +342,15 @@ msgstr "il remote %s esiste già"
 msgid "Alias %s doesn't exist"
 msgstr "il remote %s non esiste"
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr "Alias:"
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architettura: %s"
@@ -406,7 +406,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr "Aggiornamento automatico: %s"
@@ -430,7 +430,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr "Proprietà errata: %s"
@@ -497,7 +497,7 @@ msgstr "CREATO IL"
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -510,7 +510,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -595,7 +595,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr "Colonne"
 
@@ -624,7 +624,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -657,7 +657,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -665,11 +665,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -701,7 +701,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -787,7 +791,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -810,7 +814,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr "DESCRIZIONE"
@@ -847,7 +851,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -887,11 +891,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -968,7 +972,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr "Import da directory non disponibile su questa piattaforma"
 
@@ -1042,7 +1046,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1066,7 +1070,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1126,20 +1130,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1161,7 +1165,7 @@ msgstr "Creazione del container in corso"
 msgid "Exporting the backup: %s"
 msgstr "Creazione del container in corso"
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1170,8 +1174,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1207,7 +1211,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr "'%s' non è un tipo di file supportato."
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1257,7 +1261,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1392,33 +1396,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Creazione del container in corso"
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1431,14 +1435,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr "Creazione del container in corso"
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1533,7 +1537,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1554,12 +1558,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1687,11 +1691,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1714,7 +1718,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1777,7 +1782,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -2028,7 +2033,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2115,7 +2120,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2161,7 +2166,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2207,7 +2212,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2257,7 +2262,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2355,7 +2360,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2363,7 +2368,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2395,6 +2400,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2404,7 +2413,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2413,7 +2422,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr "Creazione del container in corso"
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2490,8 +2499,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2581,7 +2590,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2782,7 +2791,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2842,7 +2851,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2850,7 +2859,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2878,7 +2887,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2991,8 +3000,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3083,7 +3092,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3135,7 +3144,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3145,7 +3154,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3181,7 +3190,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3224,7 +3233,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3382,7 +3391,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3448,7 +3457,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3500,7 +3509,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3520,7 +3529,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3553,7 +3562,7 @@ msgstr "Creazione del container in corso"
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3577,7 +3586,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3621,7 +3630,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3635,7 +3644,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3668,7 +3677,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3754,7 +3763,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3936,7 +3945,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr "no"
 
@@ -3990,7 +3999,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -4030,7 +4039,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4117,7 +4126,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4260,8 +4269,8 @@ msgstr "Colonne"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr "si"
 
diff --git a/po/ja.po b/po/ja.po
index 4021fcd276..d4d01cd777 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: 2019-05-18 08:49+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -95,7 +95,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -168,7 +168,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (他%d個)"
@@ -227,15 +227,15 @@ msgstr "--refresh はコンテナの場合のみ使えます"
 msgid "--target cannot be used with containers"
 msgstr "--refresh はコンテナの場合のみ使えます"
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -307,15 +307,15 @@ msgstr "エイリアス %s は既に存在します"
 msgid "Alias %s doesn't exist"
 msgstr "エイリアス %s は存在しません"
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr "エイリアスを指定してください"
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr "エイリアス:"
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr "アーキテクチャ: %s"
@@ -375,7 +375,7 @@ msgstr "認証タイプ '%s' はサーバではサポートされていません
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr "自動更新: %s"
@@ -399,7 +399,7 @@ msgstr "不適切なキー/値のペア: %s"
 msgid "Bad key=value pair: %s"
 msgstr "不適切な キー=値 のペア: %s"
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr "不正なイメージプロパティ形式: %s"
@@ -466,7 +466,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr "クライアントバージョン: %s\n"
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr "キャッシュ済: %s"
@@ -480,7 +480,7 @@ msgstr "キャッシュ済: %s"
 msgid "Can't override configuration or profiles in local rename"
 msgstr "ローカル上のリネームでは、設定やプロファイルの上書きはできません"
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr "ターゲットイメージの名前を取得できません"
 
@@ -567,7 +567,7 @@ msgstr "クラスタメンバ名"
 msgid "Clustering enabled"
 msgstr "クラスタリングが有効になりました"
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr "カラムレイアウト"
 
@@ -600,7 +600,7 @@ msgid "Config key/value to apply to the target container"
 msgstr "移動先のコンテナに適用するキー/値の設定"
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -633,7 +633,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr "ステートフルなコンテナをステートレスにコピーします"
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "ソースからエイリアスをコピーしました"
 
@@ -641,11 +641,11 @@ msgstr "ソースからエイリアスをコピーしました"
 msgid "Copy containers within or in between LXD instances"
 msgstr "LXD インスタンス内に、またはインスタンス間でコンテナをコピーします"
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr "サーバ間でイメージをコピーします"
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -681,7 +681,12 @@ msgstr "ボリュームをコピーします (スナップショットはコピ
 msgid "Copy to a project different from the source"
 msgstr "コピー/移動元とは異なるプロジェクトにコピーします"
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+#, fuzzy
+msgid "Copy virtual machine images"
+msgstr "イメージのコピー中: %s"
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr "イメージのコピー中: %s"
@@ -770,7 +775,7 @@ msgstr "ストレージプールを作成します"
 msgid "Create the container with no profiles applied"
 msgstr "プロファイルを適用しないコンテナを作成します"
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr "作成日時: %s"
@@ -793,7 +798,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -830,7 +835,7 @@ msgstr "コンテナ内のファイルを削除します"
 msgid "Delete image aliases"
 msgstr "イメージのエイリアスを削除します"
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr "イメージを削除します"
 
@@ -870,11 +875,11 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -954,7 +959,7 @@ msgstr ""
 "サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
 "した"
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr "このプラットフォーム上ではディレクトリのインポートは利用できません"
 
@@ -1029,7 +1034,7 @@ msgstr "コンテナもしくはサーバの設定をYAMLファイルで編集
 msgid "Edit files in containers"
 msgstr "コンテナ内のファイルを編集します"
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr "イメージのプロパティを編集します"
 
@@ -1053,7 +1058,7 @@ msgstr "ストレージプールの設定をYAMLで編集します"
 msgid "Edit storage volume configurations as YAML"
 msgstr "ストレージボリュームの設定をYAMLで編集します"
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1135,20 +1140,20 @@ msgstr ""
 "デフォルトのモードは non-interactive です。もし標準入出力が両方ともターミナル"
 "の場合は interactive モードが選択されます (標準エラー出力は無視されます)。"
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr "失効日時: %s"
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr "失効日時: 失効しない"
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr "イメージをエクスポートしてダウンロードします"
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1171,7 +1176,7 @@ msgstr "コンテナを tarball 形式のバックアップとしてエクスポ
 msgid "Exporting the backup: %s"
 msgstr "バックアップのエクスポート中: %s"
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr "イメージのエクスポート中: %s"
@@ -1180,8 +1185,8 @@ msgstr "イメージのエクスポート中: %s"
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1216,7 +1221,7 @@ msgstr "Fast モード (--columns=nsacPt と同じ)"
 msgid "Filtering isn't supported yet"
 msgstr "情報表示のフィルタリングはまだサポートされていません"
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
@@ -1266,7 +1271,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1400,33 +1405,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "コンテナの状態を無視します"
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr "イメージは更新済みです。"
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr "イメージのコピーが成功しました!"
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr "イメージのエクスポートが成功しました!"
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr "イメージ名を指定してください"
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr "イメージ名を指定してください: %s"
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "イメージは以下のフィンガープリントでインポートされました: %s"
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr "イメージの更新が成功しました!"
 
@@ -1439,7 +1444,7 @@ msgstr ""
 msgid "Import container backups"
 msgstr "コンテナのバックアップをインポートします"
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
@@ -1450,7 +1455,7 @@ msgstr ""
 "ディレクトリのインポートは Linux 上でのみ可能で、root で実行する必要がありま"
 "す。"
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr "イメージをイメージストアにインポートします"
 
@@ -1548,7 +1553,7 @@ msgstr "IPアドレス:"
 msgid "IsSM: %s (%s)"
 msgstr "キャッシュ済: %s"
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr "最初にコピーした後も常にイメージを最新の状態に保つ"
 
@@ -1569,12 +1574,12 @@ msgstr "LXD - コマンドラインクライアント"
 msgid "LXD server isn't part of a cluster"
 msgstr "LXD サーバはクラスタの一部ではありません"
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr "最終使用: %s"
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr "最終使用: 未使用"
 
@@ -1762,11 +1767,12 @@ msgstr ""
 "指定するフィルタはイメージのハッシュ値の一部でもイメージのエイリアスの一部で"
 "も構いません。\n"
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr "イメージを一覧表示します"
 
-#: lxc/image.go:903
+#: lxc/image.go:934
+#, fuzzy
 msgid ""
 "List images\n"
 "\n"
@@ -1789,7 +1795,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 "イメージをリスト表示します\n"
 "\n"
@@ -1875,7 +1882,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr "イメージを public にする"
 
@@ -2145,7 +2152,7 @@ msgstr "コンテナを移動します (スナップショットは移動しま
 msgid "Moving the storage volume: %s"
 msgstr "ストレージボリュームの移動中: %s"
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr "ディレクトリからのインポートは root で実行する必要があります"
 
@@ -2232,7 +2239,7 @@ msgstr "ネットワーク使用状況:"
 msgid "New alias to define at target"
 msgstr "新しいエイリアスを定義する"
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr "イメージに新しいエイリアスを追加します"
 
@@ -2278,7 +2285,7 @@ msgstr "\"カスタム\" のボリュームのみがスナップショットを
 msgid "Only https URLs are supported for simplestreams"
 msgstr "simplestreams は https の URL のみサポートします"
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr "リモートイメージのインポートは https:// のみをサポートします"
 
@@ -2324,7 +2331,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2374,7 +2381,7 @@ msgid "Press enter to open the editor again"
 msgstr "再度エディタを開くためには Enter キーを押します"
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr "再度エディタを起動するには Enter キーを押します"
 
@@ -2472,7 +2479,7 @@ msgstr "プロジェクト %s を削除しました"
 msgid "Project %s renamed to %s"
 msgstr "プロジェクト名 %s を %s に変更しました"
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr "プロパティ:"
 
@@ -2480,7 +2487,7 @@ msgstr "プロパティ:"
 msgid "Public image server"
 msgstr "Public なイメージサーバとして設定します"
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr "パブリック: %s"
@@ -2512,6 +2519,10 @@ msgstr "コンテナ内にファイルをコピーします"
 msgid "Pushing %s to %s: %%s"
 msgstr "ファイル %s をコンテナ %s 内にコピーします: %%s"
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2521,7 +2532,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr "再帰的にファイルを転送します"
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr "イメージを更新します"
 
@@ -2530,7 +2541,7 @@ msgstr "イメージを更新します"
 msgid "Refreshing container: %s"
 msgstr "コンテナの更新中: %s"
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr "イメージの更新中: %s"
@@ -2607,8 +2618,8 @@ msgstr "信頼済みクライアントを削除します"
 msgid "Rename a cluster member"
 msgstr "クラスタメンバの名前を変更します"
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr "エイリアスの名前を変更します"
 
@@ -2704,7 +2715,7 @@ msgstr "イメージの取得中: %s"
 msgid "Run command against all containers"
 msgstr "すべてのコンテナに対してコマンドを実行します"
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2905,7 +2916,7 @@ msgstr "バックグラウンド操作の詳細を表示します"
 msgid "Show full device configuration for containers or profiles"
 msgstr "コンテナもしくはプロファイルのデバイス設定をすべて表示します"
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr "イメージのプロパティを表示します"
 
@@ -2965,7 +2976,7 @@ msgstr "ストレージプールで利用可能なリソースを表示します
 msgid "Show the used and free space in bytes"
 msgstr "使用量と空き容量を byte で表示します"
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr "イメージについての情報を表示します"
 
@@ -2973,7 +2984,7 @@ msgstr "イメージについての情報を表示します"
 msgid "Show useful information about storage pools"
 msgstr "ストレージプールの情報を表示します"
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "サイズ: %.2fMB"
@@ -3001,7 +3012,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "一部のコンテナで %s が失敗しました"
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr "取得元:"
 
@@ -3112,8 +3123,8 @@ msgstr "デフォルトのリモートを切り替えます"
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3210,7 +3221,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "コンテナを強制停止するまでの時間"
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr "タイムスタンプ:"
 
@@ -3268,7 +3279,7 @@ msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpu
 msgid "Transferring container: %s"
 msgstr "コンテナを転送中: %s"
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr "イメージを転送中: %s"
@@ -3278,7 +3289,7 @@ msgstr "イメージを転送中: %s"
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr "更に情報を得るために `lxc info --show-log %s` を実行してみてください"
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "失効日時: %s"
@@ -3291,7 +3302,7 @@ msgstr "タイプ: ephemeral"
 msgid "Type: persistent"
 msgstr "タイプ: persistent"
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3314,7 +3325,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr "テンポラリファイルを作成できません: %v"
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr "未知のカラム名の短縮形です '%c' ('%s' 中)"
@@ -3356,7 +3367,7 @@ msgstr "ストレージプールの設定を削除します"
 msgid "Unset storage volume configuration keys"
 msgstr "ストレージボリュームの設定を削除します"
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr "アップロード日時: %s"
@@ -3517,7 +3528,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3586,7 +3597,7 @@ msgstr ""
 "delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
 "<snapshot>]...]"
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr "delete [<remote>:]<image> [[<remote>:]<image>...]"
 
@@ -3638,7 +3649,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr "無効"
 
@@ -3658,7 +3669,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3691,7 +3702,7 @@ msgstr "restore [<remote>:]<container> <snapshot>"
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr "有効"
 
@@ -3717,7 +3728,7 @@ msgstr ""
 "export [<remote>:]<container> [target] [--container-only] [--optimized-"
 "storage]"
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3761,7 +3772,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3775,7 +3786,7 @@ msgstr ""
 msgid "info"
 msgstr "ストレージ情報"
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3809,7 +3820,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3923,7 +3934,7 @@ msgstr ""
 "   /etc/hosts ファイルを、コンテナ \"foo\" 内 (の /etc/hosts) にコピーしま"
 "す。"
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -4186,7 +4197,7 @@ msgstr "名前"
 msgid "network"
 msgstr "network"
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -4246,7 +4257,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 
@@ -4286,7 +4297,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4380,7 +4391,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4522,8 +4533,8 @@ msgstr "volume"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index 018306fd42..511b29aeb6 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/lxd.pot b/po/lxd.pot
index fb7465cbd7..fc76fe81f1 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-09-06 02:09-0400\n"
+        "POT-Creation-Date: 2019-09-13 15:47+0200\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"
@@ -88,7 +88,7 @@ msgid   "### This is a yaml representation of the container metadata.\n"
         "###     properties: {}"
 msgstr  ""
 
-#: lxc/image.go:327
+#: 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"
@@ -157,7 +157,7 @@ msgstr  ""
 msgid   "%d (id: %d, online: %v)"
 msgstr  ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid   "%s (%d more)"
 msgstr  ""
@@ -212,15 +212,15 @@ msgstr  ""
 msgid   "--target cannot be used with containers"
 msgstr  ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid   "ALIAS"
 msgstr  ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid   "ALIASES"
 msgstr  ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid   "ARCH"
 msgstr  ""
 
@@ -289,15 +289,15 @@ msgstr  ""
 msgid   "Alias %s doesn't exist"
 msgstr  ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid   "Alias name missing"
 msgstr  ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid   "Aliases:"
 msgstr  ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid   "Architecture: %s"
 msgstr  ""
@@ -352,7 +352,7 @@ msgstr  ""
 msgid   "Auto negotiation: %v"
 msgstr  ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid   "Auto update: %s"
 msgstr  ""
@@ -375,7 +375,7 @@ msgstr  ""
 msgid   "Bad key=value pair: %s"
 msgstr  ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid   "Bad property: %s"
 msgstr  ""
@@ -441,7 +441,7 @@ msgstr  ""
 msgid   "CUDA Version: %v"
 msgstr  ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid   "Cached: %s"
 msgstr  ""
@@ -454,7 +454,7 @@ msgstr  ""
 msgid   "Can't override configuration or profiles in local rename"
 msgstr  ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid   "Can't provide a name for the target image"
 msgstr  ""
 
@@ -528,7 +528,7 @@ msgstr  ""
 msgid   "Clustering enabled"
 msgstr  ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid   "Columns"
 msgstr  ""
 
@@ -555,7 +555,7 @@ msgstr  ""
 msgid   "Config key/value to apply to the target container"
 msgstr  ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143 lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303 lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303 lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid   "Config parsing error: %s"
 msgstr  ""
@@ -587,7 +587,7 @@ msgstr  ""
 msgid   "Copy a stateful container stateless"
 msgstr  ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid   "Copy aliases from source"
 msgstr  ""
 
@@ -595,11 +595,11 @@ msgstr  ""
 msgid   "Copy containers within or in between LXD instances"
 msgstr  ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid   "Copy images between servers"
 msgstr  ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid   "Copy images between servers\n"
         "\n"
         "The auto-update flag instructs the server to keep this image up to date.\n"
@@ -630,7 +630,11 @@ msgstr  ""
 msgid   "Copy to a project different from the source"
 msgstr  ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid   "Copy virtual machine images"
+msgstr  ""
+
+#: lxc/image.go:223
 #, c-format
 msgid   "Copying the image: %s"
 msgstr  ""
@@ -712,7 +716,7 @@ msgstr  ""
 msgid   "Create the container with no profiles applied"
 msgstr  ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid   "Created: %s"
 msgstr  ""
@@ -735,7 +739,7 @@ msgstr  ""
 msgid   "DATABASE"
 msgstr  ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869 lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869 lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid   "DESCRIPTION"
 msgstr  ""
 
@@ -771,7 +775,7 @@ msgstr  ""
 msgid   "Delete image aliases"
 msgstr  ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid   "Delete images"
 msgstr  ""
 
@@ -795,7 +799,7 @@ 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:21 lxc/alias.go:53 lxc/alias.go:99 lxc/alias.go:143 lxc/alias.go:194 lxc/cluster.go:28 lxc/cluster.go:67 lxc/cluster.go:145 lxc/cluster.go:195 lxc/cluster.go:245 lxc/cluster.go:330 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:182 lxc/config_device.go:255 lxc/config_device.go:321 lxc/config_device.go:410 lxc/config_device.go:500 lxc/config_device.go:599 lxc/config_device.go:667 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:28 lxc/config_template.go:65 lxc/config_template.go:108 lxc/config_template.go:150 lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32 lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31 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:127 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789 lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24 lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149 lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39 lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107 lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375 lxc/network.go:460 lxc/network.go:545 lxc/network.go:668 lxc/network.go:726 lxc/network.go:806 lxc/network.go:891 lxc/network.go:960 lxc/network.go:1010 lxc/network.go:1080 lxc/network.go:1142 lxc/operation.go:23 lxc/operation.go:52 lxc/operation.go:101 lxc/operation.go:180 lxc/profile.go:28 lxc/profile.go:100 lxc/profile.go:163 lxc/profile.go:243 lxc/profile.go:299 lxc/profile.go:353 lxc/profile.go:403 lxc/profile.go:527 lxc/profile.go:576 lxc/profile.go:635 lxc/profile.go:711 lxc/profile.go:761 lxc/profile.go:820 lxc/profile.go:874 lxc/project.go:28 lxc/project.go:85 lxc/project.go:150 lxc/project.go:213 lxc/project.go:333 lxc/project.go:383 lxc/project.go:468 lxc/project.go:523 lxc/project.go:583 lxc/project.go:612 lxc/project.go:665 lxc/publish.go:35 lxc/query.go:30 lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:418 lxc/remote.go:454 lxc/remote.go:534 lxc/remote.go:596 lxc/remote.go:646 lxc/remote.go:684 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:32 lxc/storage.go:88 lxc/storage.go:162 lxc/storage.go:212 lxc/storage.go:332 lxc/storage.go:387 lxc/storage.go:507 lxc/storage.go:581 lxc/storage.go:650 lxc/storage.go:734 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:1276 lxc/storage_volume.go:1352 lxc/storage_volume.go:1451 lxc/storage_volume.go:1482 lxc/storage_volume.go:1553 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:21 lxc/alias.go:53 lxc/alias.go:99 lxc/alias.go:143 lxc/alias.go:194 lxc/cluster.go:28 lxc/cluster.go:67 lxc/cluster.go:145 lxc/cluster.go:195 lxc/cluster.go:245 lxc/cluster.go:330 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:182 lxc/config_device.go:255 lxc/config_device.go:321 lxc/config_device.go:410 lxc/config_device.go:500 lxc/config_device.go:599 lxc/config_device.go:667 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:28 lxc/config_template.go:65 lxc/config_template.go:108 lxc/config_template.go:150 lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32 lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31 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:592 lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24 lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149 lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39 lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107 lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375 lxc/network.go:460 lxc/network.go:545 lxc/network.go:668 lxc/network.go:726 lxc/network.go:806 lxc/network.go:891 lxc/network.go:960 lxc/network.go:1010 lxc/network.go:1080 lxc/network.go:1142 lxc/operation.go:23 lxc/operation.go:52 lxc/operation.go:101 lxc/operation.go:180 lxc/profile.go:28 lxc/profile.go:100 lxc/profile.go:163 lxc/profile.go:243 lxc/profile.go:299 lxc/profile.go:353 lxc/profile.go:403 lxc/profile.go:527 lxc/profile.go:576 lxc/profile.go:635 lxc/profile.go:711 lxc/profile.go:761 lxc/profile.go:820 lxc/profile.go:874 lxc/project.go:28 lxc/project.go:85 lxc/project.go:150 lxc/project.go:213 lxc/project.go:333 lxc/project.go:383 lxc/project.go:468 lxc/project.go:523 lxc/project.go:583 lxc/project.go:612 lxc/project.go:665 lxc/publish.go:35 lxc/query.go:30 lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:418 lxc/remote.go:454 lxc/remote.go:534 lxc/remote.go:596 lxc/remote.go:646 lxc/remote.go:684 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:32 lxc/storage.go:88 lxc/storage.go:162 lxc/storage.go:212 lxc/storage.go:332 lxc/storage.go:387 lxc/storage.go:507 lxc/storage.go:581 lxc/storage.go:650 lxc/storage.go:734 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:1276 lxc/storage_volume.go:1352 lxc/storage_volume.go:1451 lxc/storage_volume.go:1482 lxc/storage_volume.go:1553 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -844,7 +848,7 @@ msgstr  ""
 msgid   "Didn't get any affected image, container or snapshot from server"
 msgstr  ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid   "Directory import is not available on this platform"
 msgstr  ""
 
@@ -914,7 +918,7 @@ msgstr  ""
 msgid   "Edit files in containers"
 msgstr  ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid   "Edit image properties"
 msgstr  ""
 
@@ -938,7 +942,7 @@ msgstr  ""
 msgid   "Edit storage volume configurations as YAML"
 msgstr  ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid   "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr  ""
@@ -992,20 +996,20 @@ msgid   "Execute commands in containers\n"
         "Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored)."
 msgstr  ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid   "Expires: %s"
 msgstr  ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid   "Expires: never"
 msgstr  ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid   "Export and download images"
 msgstr  ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid   "Export and download images\n"
         "\n"
         "The output target is optional and defaults to the working directory."
@@ -1024,7 +1028,7 @@ msgstr  ""
 msgid   "Exporting the backup: %s"
 msgstr  ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid   "Exporting the image: %s"
 msgstr  ""
@@ -1033,7 +1037,7 @@ msgstr  ""
 msgid   "FILENAME"
 msgstr  ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939 lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971 lxc/image_alias.go:231
 msgid   "FINGERPRINT"
 msgstr  ""
 
@@ -1068,7 +1072,7 @@ msgstr  ""
 msgid   "Filtering isn't supported yet"
 msgstr  ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid   "Fingerprint: %s"
 msgstr  ""
@@ -1112,7 +1116,7 @@ msgid   "Forcefully removing a server from the cluster should only be done as a
         "Are you really sure you want to force removing %s? (yes/no): "
 msgstr  ""
 
-#: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238 lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154 lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103 lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509 lxc/storage_volume.go:1071
+#: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238 lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154 lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103 lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509 lxc/storage_volume.go:1071
 msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
@@ -1241,33 +1245,33 @@ msgstr  ""
 msgid   "Ignore the container state"
 msgstr  ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid   "Image already up to date."
 msgstr  ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid   "Image copied successfully!"
 msgstr  ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid   "Image exported successfully!"
 msgstr  ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid   "Image identifier missing"
 msgstr  ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid   "Image identifier missing: %s"
 msgstr  ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid   "Image imported with fingerprint: %s"
 msgstr  ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid   "Image refreshed successfully!"
 msgstr  ""
 
@@ -1279,13 +1283,13 @@ msgstr  ""
 msgid   "Import container backups"
 msgstr  ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid   "Import image into the image store\n"
         "\n"
         "Directory import is only available on Linux and must be performed as root."
 msgstr  ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid   "Import images into the image store"
 msgstr  ""
 
@@ -1378,7 +1382,7 @@ msgstr  ""
 msgid   "IsSM: %s (%s)"
 msgstr  ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid   "Keep the image up to date after initial copy"
 msgstr  ""
 
@@ -1398,12 +1402,12 @@ msgstr  ""
 msgid   "LXD server isn't part of a cluster"
 msgstr  ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid   "Last used: %s"
 msgstr  ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid   "Last used: never"
 msgstr  ""
 
@@ -1524,11 +1528,11 @@ msgid   "List image aliases\n"
         "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr  ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid   "List images"
 msgstr  ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid   "List images\n"
         "\n"
         "Filters may be of the <key>=<value> form for property based filtering,\n"
@@ -1550,7 +1554,8 @@ msgid   "List images\n"
         "    d - Description\n"
         "    a - Architecture\n"
         "    s - Size\n"
-        "    u - Upload date"
+        "    u - Upload date\n"
+        "    t - Type"
 msgstr  ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1613,7 +1618,7 @@ msgstr  ""
 msgid   "MTU: %d"
 msgstr  ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid   "Make image public"
 msgstr  ""
 
@@ -1837,7 +1842,7 @@ msgstr  ""
 msgid   "Moving the storage volume: %s"
 msgstr  ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid   "Must run as root to import from directory"
 msgstr  ""
 
@@ -1921,7 +1926,7 @@ msgstr  ""
 msgid   "New alias to define at target"
 msgstr  ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid   "New aliases to add to the image"
 msgstr  ""
 
@@ -1967,7 +1972,7 @@ msgstr  ""
 msgid   "Only https URLs are supported for simplestreams"
 msgstr  ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid   "Only https:// is supported for remote image import"
 msgstr  ""
 
@@ -2013,7 +2018,7 @@ msgstr  ""
 msgid   "PROTOCOL"
 msgstr  ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid   "PUBLIC"
 msgstr  ""
 
@@ -2060,7 +2065,7 @@ msgstr  ""
 msgid   "Press enter to open the editor again"
 msgstr  ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144 lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144 lxc/config_template.go:203 lxc/image.go:415
 msgid   "Press enter to start the editor again"
 msgstr  ""
 
@@ -2158,7 +2163,7 @@ msgstr  ""
 msgid   "Project %s renamed to %s"
 msgstr  ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid   "Properties:"
 msgstr  ""
 
@@ -2166,7 +2171,7 @@ msgstr  ""
 msgid   "Public image server"
 msgstr  ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid   "Public: %s"
 msgstr  ""
@@ -2198,6 +2203,10 @@ msgstr  ""
 msgid   "Pushing %s to %s: %%s"
 msgstr  ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid   "Query virtual machine images"
+msgstr  ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid   "Read-Only: %v"
@@ -2207,7 +2216,7 @@ msgstr  ""
 msgid   "Recursively transfer files"
 msgstr  ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid   "Refresh images"
 msgstr  ""
 
@@ -2216,7 +2225,7 @@ msgstr  ""
 msgid   "Refreshing container: %s"
 msgstr  ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid   "Refreshing the image: %s"
 msgstr  ""
@@ -2292,7 +2301,7 @@ msgstr  ""
 msgid   "Rename a cluster member"
 msgstr  ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245 lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250 lxc/image_alias.go:251
 msgid   "Rename aliases"
 msgstr  ""
 
@@ -2379,7 +2388,7 @@ msgstr  ""
 msgid   "Run command against all containers"
 msgstr  ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid   "SIZE"
 msgstr  ""
 
@@ -2565,7 +2574,7 @@ msgstr  ""
 msgid   "Show full device configuration for containers or profiles"
 msgstr  ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid   "Show image properties"
 msgstr  ""
 
@@ -2625,7 +2634,7 @@ msgstr  ""
 msgid   "Show the used and free space in bytes"
 msgstr  ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid   "Show useful information about images"
 msgstr  ""
 
@@ -2633,7 +2642,7 @@ msgstr  ""
 msgid   "Show useful information about storage pools"
 msgstr  ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid   "Size: %.2fMB"
 msgstr  ""
@@ -2661,7 +2670,7 @@ msgstr  ""
 msgid   "Some containers failed to %s"
 msgstr  ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid   "Source:"
 msgstr  ""
 
@@ -2772,7 +2781,7 @@ msgstr  ""
 msgid   "TARGET"
 msgstr  ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid   "TYPE"
 msgstr  ""
 
@@ -2854,7 +2863,7 @@ msgstr  ""
 msgid   "Time to wait for the container before killing it"
 msgstr  ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid   "Timestamps:"
 msgstr  ""
 
@@ -2905,7 +2914,7 @@ msgstr  ""
 msgid   "Transferring container: %s"
 msgstr  ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid   "Transferring image: %s"
 msgstr  ""
@@ -2915,7 +2924,7 @@ msgstr  ""
 msgid   "Try `lxc info --show-log %s` for more info"
 msgstr  ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid   "Type: %s"
 msgstr  ""
@@ -2928,7 +2937,7 @@ msgstr  ""
 msgid   "Type: persistent"
 msgstr  ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid   "UPLOAD DATE"
 msgstr  ""
 
@@ -2950,7 +2959,7 @@ msgstr  ""
 msgid   "Unable to create a temporary file: %v"
 msgstr  ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid   "Unknown column shorthand char '%c' in '%s'"
 msgstr  ""
@@ -2992,7 +3001,7 @@ msgstr  ""
 msgid   "Unset storage volume configuration keys"
 msgstr  ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid   "Uploaded: %s"
 msgstr  ""
@@ -3139,7 +3148,7 @@ msgstr  ""
 msgid   "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr  ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid   "copy [<remote>:]<image> <remote>:"
 msgstr  ""
 
@@ -3203,7 +3212,7 @@ msgstr  ""
 msgid   "delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/<snapshot>]...]"
 msgstr  ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid   "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr  ""
 
@@ -3255,7 +3264,7 @@ msgstr  ""
 msgid   "device"
 msgstr  ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid   "disabled"
 msgstr  ""
 
@@ -3275,7 +3284,7 @@ msgstr  ""
 msgid   "edit [<remote>:]<container>/<path>"
 msgstr  ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid   "edit [<remote>:]<image>"
 msgstr  ""
 
@@ -3307,7 +3316,7 @@ msgstr  ""
 msgid   "enable [<remote>:] <name>"
 msgstr  ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid   "enabled"
 msgstr  ""
 
@@ -3329,7 +3338,7 @@ msgstr  ""
 msgid   "export [<remote>:]<container> [target] [--container-only] [--optimized-storage]"
 msgstr  ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid   "export [<remote>:]<image> [<target>]"
 msgstr  ""
 
@@ -3373,7 +3382,7 @@ msgstr  ""
 msgid   "image"
 msgstr  ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid   "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] [key=value...]"
 msgstr  ""
 
@@ -3385,7 +3394,7 @@ msgstr  ""
 msgid   "info"
 msgstr  ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid   "info [<remote>:]<image>"
 msgstr  ""
 
@@ -3417,7 +3426,7 @@ msgstr  ""
 msgid   "list [<remote>:]"
 msgstr  ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid   "list [<remote>:] [<filter>...]"
 msgstr  ""
 
@@ -3492,7 +3501,7 @@ msgid   "lxc file push /etc/hosts foo/etc/hosts\n"
         "   To push /etc/hosts into the container \"foo\"."
 msgstr  ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid   "lxc image edit <image>\n"
         "    Launch a text editor to edit the properties\n"
         "\n"
@@ -3648,7 +3657,7 @@ msgstr  ""
 msgid   "network"
 msgstr  ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid   "no"
 msgstr  ""
 
@@ -3696,7 +3705,7 @@ msgstr  ""
 msgid   "query [<remote>:]<API path>"
 msgstr  ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid   "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr  ""
 
@@ -3736,7 +3745,7 @@ msgstr  ""
 msgid   "rename <remote> <new-name>"
 msgstr  ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid   "rename [<remote>:]<alias> <new-name>"
 msgstr  ""
 
@@ -3820,7 +3829,7 @@ msgstr  ""
 msgid   "show [<remote>:]<container|profile>"
 msgstr  ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid   "show [<remote>:]<image>"
 msgstr  ""
 
@@ -3961,7 +3970,7 @@ msgstr  ""
 msgid   "y"
 msgstr  ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829 lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854 lxc/image.go:1028
 msgid   "yes"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index ddfefc3dde..af4c6070e9 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 52fb11098e..b840dce607 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: 2019-02-26 09:18+0000\n"
 "Last-Translator: Heimen Stoffels <vistausss at outlook.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -135,7 +135,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -214,7 +214,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (en nog %d)"
@@ -270,15 +270,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr "ARCHITECTUUR"
 
@@ -350,15 +350,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -414,7 +414,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -438,7 +438,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -504,7 +504,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -517,7 +517,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -601,7 +601,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -630,7 +630,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -663,7 +663,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -671,11 +671,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -707,7 +707,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -790,7 +794,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -813,7 +817,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -850,7 +854,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -890,11 +894,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -971,7 +975,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -1043,7 +1047,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1067,7 +1071,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1127,20 +1131,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1160,7 +1164,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1169,8 +1173,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1205,7 +1209,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1255,7 +1259,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1389,33 +1393,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1427,14 +1431,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1528,7 +1532,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1549,12 +1553,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1680,11 +1684,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1707,7 +1711,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1770,7 +1775,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -2017,7 +2022,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2104,7 +2109,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2150,7 +2155,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2245,7 +2250,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2343,7 +2348,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2351,7 +2356,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2383,6 +2388,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2392,7 +2401,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2401,7 +2410,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2478,8 +2487,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2568,7 +2577,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2769,7 +2778,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2829,7 +2838,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2837,7 +2846,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2865,7 +2874,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2976,8 +2985,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3067,7 +3076,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3119,7 +3128,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3129,7 +3138,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3142,7 +3151,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3165,7 +3174,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3207,7 +3216,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3363,7 +3372,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3429,7 +3438,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3481,7 +3490,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3501,7 +3510,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3533,7 +3542,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3557,7 +3566,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3601,7 +3610,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3615,7 +3624,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3648,7 +3657,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3734,7 +3743,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3916,7 +3925,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3970,7 +3979,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -4010,7 +4019,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4096,7 +4105,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4237,7 +4246,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 283e1cf617..4c90c5b3da 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 1c558445a9..329051614b 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\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/"
@@ -123,7 +123,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -214,7 +214,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -270,15 +270,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -350,15 +350,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -414,7 +414,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -438,7 +438,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -504,7 +504,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -517,7 +517,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -601,7 +601,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -630,7 +630,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -663,7 +663,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -671,11 +671,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -707,7 +707,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -790,7 +794,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -813,7 +817,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -850,7 +854,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -890,11 +894,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -971,7 +975,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -1043,7 +1047,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1067,7 +1071,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1127,20 +1131,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1160,7 +1164,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1169,8 +1173,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1205,7 +1209,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1255,7 +1259,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1389,33 +1393,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1427,14 +1431,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1528,7 +1532,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1549,12 +1553,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1680,11 +1684,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1707,7 +1711,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1770,7 +1775,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -2017,7 +2022,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2104,7 +2109,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2150,7 +2155,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2245,7 +2250,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2343,7 +2348,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2351,7 +2356,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2383,6 +2388,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2392,7 +2401,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2401,7 +2410,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2478,8 +2487,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2568,7 +2577,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2769,7 +2778,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2829,7 +2838,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2837,7 +2846,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2865,7 +2874,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2976,8 +2985,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3067,7 +3076,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3119,7 +3128,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3129,7 +3138,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3142,7 +3151,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3165,7 +3174,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3207,7 +3216,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3363,7 +3372,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3429,7 +3438,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3481,7 +3490,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3501,7 +3510,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3533,7 +3542,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3557,7 +3566,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3601,7 +3610,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3615,7 +3624,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3648,7 +3657,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3734,7 +3743,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3916,7 +3925,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3970,7 +3979,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -4010,7 +4019,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4096,7 +4105,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4237,7 +4246,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 242209107c..06ee0799a3 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: 2019-08-08 18:08+0000\n"
 "Last-Translator: Tiago A. Reul <tiago at reul.space>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -157,7 +157,7 @@ msgstr ""
 "###     template: template.tpl\n"
 "###     properties: {}"
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -284,7 +284,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (%d mais)"
@@ -342,15 +342,15 @@ msgstr "--refresh só pode ser usado com containers"
 msgid "--target cannot be used with containers"
 msgstr "--refresh só pode ser usado com containers"
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr "ARQUITETURA"
 
@@ -422,15 +422,15 @@ msgstr "Alias %s já existe"
 msgid "Alias %s doesn't exist"
 msgstr "Alias %s não existe"
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr "Nome do alias ausente"
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr "Aliases:"
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr "Arquitetura: %s"
@@ -486,7 +486,7 @@ msgstr "Tipo de autenticação '%s' não suportada pelo servidor"
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr "Atualização automática: %s"
@@ -510,7 +510,7 @@ msgstr "par de chave/valor inválido %s"
 msgid "Bad key=value pair: %s"
 msgstr "par de chave=valor inválido %s"
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr "Propriedade ruim: %s"
@@ -576,7 +576,7 @@ msgstr "CRIADO EM"
 msgid "CUDA Version: %v"
 msgstr "Versão CUDA: %v"
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr "Em cache: %s"
@@ -590,7 +590,7 @@ msgstr "Em cache: %s"
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr "Não pode fornecer um nome para a imagem de destino"
 
@@ -675,7 +675,7 @@ msgstr "Nome de membro do cluster"
 msgid "Clustering enabled"
 msgstr "Clustering ativado"
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr "Colunas"
 
@@ -709,7 +709,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -742,7 +742,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "Aliases de cópia da fonte"
 
@@ -750,11 +750,11 @@ msgstr "Aliases de cópia da fonte"
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr "Copiar imagens entre servidores"
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -786,7 +786,12 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+#, fuzzy
+msgid "Copy virtual machine images"
+msgstr "Copiar a imagem: %s"
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Copiar a imagem: %s"
@@ -873,7 +878,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr "Criado: %s"
@@ -896,7 +901,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -933,7 +938,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr "Apagar nomes alternativos da imagem"
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -973,11 +978,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -1054,7 +1059,7 @@ msgstr "Em cache: %s"
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr "A importação de diretório não está disponível nessa plataforma"
 
@@ -1128,7 +1133,7 @@ msgstr "Editar configurações do container ou do servidor como YAML"
 msgid "Edit files in containers"
 msgstr "Editar arquivos no container"
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr "Editar propriedades da imagem"
 
@@ -1153,7 +1158,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1213,20 +1218,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1246,7 +1251,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1255,8 +1260,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1291,7 +1296,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1341,7 +1346,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1476,33 +1481,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Ignorar o estado do container"
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr "Imagem exportada com sucesso!"
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr "Falta o identificador da imagem"
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr "Falta o identificador da imagem: %s"
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1514,14 +1519,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1615,7 +1620,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr "Em cache: %s"
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1636,12 +1641,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1767,11 +1772,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1794,7 +1799,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1857,7 +1863,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -2104,7 +2110,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2191,7 +2197,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2237,7 +2243,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2283,7 +2289,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2332,7 +2338,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2430,7 +2436,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2438,7 +2444,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2470,6 +2476,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2479,7 +2489,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2488,7 +2498,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr "Editar arquivos no container"
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2565,8 +2575,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2655,7 +2665,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2857,7 +2867,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2917,7 +2927,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2925,7 +2935,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2953,7 +2963,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -3064,8 +3074,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3155,7 +3165,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3207,7 +3217,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3217,7 +3227,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3230,7 +3240,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3253,7 +3263,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3296,7 +3306,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3452,7 +3462,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3518,7 +3528,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3570,7 +3580,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3590,7 +3600,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3622,7 +3632,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3646,7 +3656,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3690,7 +3700,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3704,7 +3714,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3737,7 +3747,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3823,7 +3833,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -4005,7 +4015,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -4059,7 +4069,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -4099,7 +4109,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4185,7 +4195,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4326,8 +4336,8 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr "sim"
 
diff --git a/po/ru.po b/po/ru.po
index 6e7964718f..c1da0d4ef0 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\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/"
@@ -145,7 +145,7 @@ msgstr ""
 "###\n"
 "### Обратите внимание, что имя отображается, но не может быть изменено"
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -275,7 +275,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -331,16 +331,16 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr "ПСЕВДОНИМ"
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 #, fuzzy
 msgid "ALIASES"
 msgstr "ПСЕВДОНИМ"
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr "ARCH"
 
@@ -413,15 +413,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr "Псевдонимы:"
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr "Архитектура: %s"
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr "Авто-обновление: %s"
@@ -501,7 +501,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -569,7 +569,7 @@ msgstr "СОЗДАН"
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -582,7 +582,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -667,7 +667,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr "Столбцы"
 
@@ -696,7 +696,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -729,7 +729,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr "Копировать псевдонимы из источника"
 
@@ -737,11 +737,11 @@ msgstr "Копировать псевдонимы из источника"
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -774,7 +774,12 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+#, fuzzy
+msgid "Copy virtual machine images"
+msgstr "Копирование образа: %s"
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Копирование образа: %s"
@@ -863,7 +868,7 @@ msgstr "Копирование образа: %s"
 msgid "Create the container with no profiles applied"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -886,7 +891,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -925,7 +930,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -966,11 +971,11 @@ msgstr "Копирование образа: %s"
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -1047,7 +1052,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -1123,7 +1128,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1147,7 +1152,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1207,21 +1212,21 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 #, fuzzy
 msgid "Export and download images"
 msgstr "Копирование образа: %s"
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1243,7 +1248,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Exporting the backup: %s"
 msgstr "Копирование образа: %s"
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, fuzzy, c-format
 msgid "Exporting the image: %s"
 msgstr "Копирование образа: %s"
@@ -1252,8 +1257,8 @@ msgstr "Копирование образа: %s"
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1288,7 +1293,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1338,7 +1343,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1473,33 +1478,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1512,14 +1517,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 #, fuzzy
 msgid "Import images into the image store"
 msgstr "Копирование образа: %s"
@@ -1614,7 +1619,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1635,12 +1640,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1768,11 +1773,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1795,7 +1800,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1859,7 +1865,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -2115,7 +2121,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr "Копирование образа: %s"
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2203,7 +2209,7 @@ msgstr " Использование сети:"
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2250,7 +2256,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2296,7 +2302,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2345,7 +2351,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2443,7 +2449,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2451,7 +2457,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2483,6 +2489,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2492,7 +2502,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 #, fuzzy
 msgid "Refresh images"
 msgstr "Копирование образа: %s"
@@ -2502,7 +2512,7 @@ msgstr "Копирование образа: %s"
 msgid "Refreshing container: %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "Копирование образа: %s"
@@ -2580,8 +2590,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2674,7 +2684,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2877,7 +2887,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2937,7 +2947,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2945,7 +2955,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2974,7 +2984,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -3087,8 +3097,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3178,7 +3188,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3230,7 +3240,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3240,7 +3250,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3253,7 +3263,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3276,7 +3286,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3318,7 +3328,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3475,7 +3485,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3549,7 +3559,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 #, fuzzy
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -3613,7 +3623,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3633,7 +3643,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3673,7 +3683,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3701,7 +3711,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3753,7 +3763,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3767,7 +3777,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3804,7 +3814,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3890,7 +3900,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -4076,7 +4086,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -4142,7 +4152,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 #, fuzzy
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -4186,7 +4196,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4312,7 +4322,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4478,8 +4488,8 @@ msgstr "Столбцы"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr "да"
 
diff --git a/po/sr.po b/po/sr.po
index 22770a4391..c1d99fb801 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 1c6fa83ff7..5484c2dfe2 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index e331a5164d..3b3517522c 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 9bd72a79eb..92105ce1a8 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index d487bed4d6..00c2ea3f2f 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -221,15 +221,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -301,15 +301,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -622,11 +622,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -658,7 +658,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -741,7 +745,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -841,11 +845,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -922,7 +926,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -994,7 +998,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1018,7 +1022,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1078,20 +1082,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1111,7 +1115,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1120,8 +1124,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1206,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1340,33 +1344,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1378,14 +1382,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1500,12 +1504,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1631,11 +1635,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1658,7 +1662,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1721,7 +1726,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1968,7 +1973,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2055,7 +2060,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2101,7 +2106,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2147,7 +2152,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2196,7 +2201,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2294,7 +2299,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2302,7 +2307,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2334,6 +2339,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2343,7 +2352,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2352,7 +2361,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2429,8 +2438,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2519,7 +2528,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2720,7 +2729,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2780,7 +2789,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2788,7 +2797,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2816,7 +2825,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2927,8 +2936,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3018,7 +3027,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3070,7 +3079,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3093,7 +3102,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3158,7 +3167,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3314,7 +3323,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3380,7 +3389,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3432,7 +3441,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3452,7 +3461,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3484,7 +3493,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3508,7 +3517,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3552,7 +3561,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3566,7 +3575,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3599,7 +3608,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3685,7 +3694,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3867,7 +3876,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3921,7 +3930,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3961,7 +3970,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4047,7 +4056,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4188,7 +4197,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index a48cb4f486..636d0a0a96 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-09-06 02:09-0400\n"
+"POT-Creation-Date: 2019-09-13 15:47+0200\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/"
@@ -95,7 +95,7 @@ msgid ""
 "###     properties: {}"
 msgstr ""
 
-#: lxc/image.go:327
+#: lxc/image.go:336
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -168,7 +168,7 @@ msgstr ""
 msgid "%d (id: %d, online: %v)"
 msgstr ""
 
-#: lxc/image.go:970
+#: lxc/image.go:1003
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -224,15 +224,15 @@ msgstr ""
 msgid "--target cannot be used with containers"
 msgstr ""
 
-#: lxc/alias.go:125 lxc/image.go:936 lxc/image_alias.go:226
+#: lxc/alias.go:125 lxc/image.go:968 lxc/image_alias.go:230
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:937
+#: lxc/image.go:969
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:942
+#: lxc/image.go:974
 msgid "ARCH"
 msgstr ""
 
@@ -304,15 +304,15 @@ msgstr ""
 msgid "Alias %s doesn't exist"
 msgstr ""
 
-#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:270
+#: lxc/image_alias.go:81 lxc/image_alias.go:128 lxc/image_alias.go:275
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:898
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:839 lxc/info.go:446
+#: lxc/image.go:869 lxc/info.go:446
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -368,7 +368,7 @@ msgstr ""
 msgid "Auto negotiation: %v"
 msgstr ""
 
-#: lxc/image.go:877
+#: lxc/image.go:908
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -392,7 +392,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:684
+#: lxc/image.go:701
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -458,7 +458,7 @@ msgstr ""
 msgid "CUDA Version: %v"
 msgstr ""
 
-#: lxc/image.go:876
+#: lxc/image.go:907
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -471,7 +471,7 @@ msgstr ""
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
-#: lxc/image.go:171
+#: lxc/image.go:173
 msgid "Can't provide a name for the target image"
 msgstr ""
 
@@ -555,7 +555,7 @@ msgstr ""
 msgid "Clustering enabled"
 msgstr ""
 
-#: lxc/image.go:927 lxc/list.go:112
+#: lxc/image.go:959 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -584,7 +584,7 @@ msgid "Config key/value to apply to the target container"
 msgstr ""
 
 #: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:405 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
+#: lxc/image.go:414 lxc/network.go:639 lxc/profile.go:497 lxc/project.go:303
 #: lxc/storage.go:302 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
@@ -617,7 +617,7 @@ msgstr ""
 msgid "Copy a stateful container stateless"
 msgstr ""
 
-#: lxc/image.go:134
+#: lxc/image.go:135
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -625,11 +625,11 @@ msgstr ""
 msgid "Copy containers within or in between LXD instances"
 msgstr ""
 
-#: lxc/image.go:126
+#: lxc/image.go:127
 msgid "Copy images between servers"
 msgstr ""
 
-#: lxc/image.go:127
+#: lxc/image.go:128
 msgid ""
 "Copy images between servers\n"
 "\n"
@@ -661,7 +661,11 @@ msgstr ""
 msgid "Copy to a project different from the source"
 msgstr ""
 
-#: lxc/image.go:214
+#: lxc/image.go:138
+msgid "Copy virtual machine images"
+msgstr ""
+
+#: lxc/image.go:223
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -744,7 +748,7 @@ msgstr ""
 msgid "Create the container with no profiles applied"
 msgstr ""
 
-#: lxc/image.go:845 lxc/info.go:448
+#: lxc/image.go:876 lxc/info.go:448
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -767,7 +771,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:941 lxc/image_alias.go:228 lxc/list.go:421 lxc/network.go:869
+#: lxc/image.go:973 lxc/image_alias.go:233 lxc/list.go:421 lxc/network.go:869
 #: lxc/operation.go:159 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid "DESCRIPTION"
 msgstr ""
@@ -804,7 +808,7 @@ msgstr ""
 msgid "Delete image aliases"
 msgstr ""
 
-#: lxc/image.go:260 lxc/image.go:261
+#: lxc/image.go:269 lxc/image.go:270
 msgid "Delete images"
 msgstr ""
 
@@ -844,11 +848,11 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
 #: 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:127 lxc/image.go:261
-#: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
-#: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
+#: 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:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
-#: lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
+#: lxc/image_alias.go:251 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39
 #: lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107
 #: lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375
@@ -925,7 +929,7 @@ msgstr ""
 msgid "Didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:590
+#: lxc/image.go:607
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -997,7 +1001,7 @@ msgstr ""
 msgid "Edit files in containers"
 msgstr ""
 
-#: lxc/image.go:311 lxc/image.go:312
+#: lxc/image.go:320 lxc/image.go:321
 msgid "Edit image properties"
 msgstr ""
 
@@ -1021,7 +1025,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:952 lxc/list.go:462
+#: lxc/image.go:985 lxc/list.go:462
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -1081,20 +1085,20 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:851
+#: lxc/image.go:882
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:853
+#: lxc/image.go:884
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:445
 msgid "Export and download images"
 msgstr ""
 
-#: lxc/image.go:435
+#: lxc/image.go:446
 msgid ""
 "Export and download images\n"
 "\n"
@@ -1114,7 +1118,7 @@ msgstr ""
 msgid "Exporting the backup: %s"
 msgstr ""
 
-#: lxc/image.go:495
+#: lxc/image.go:512
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -1123,8 +1127,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image.go:938 lxc/image.go:939
-#: lxc/image_alias.go:227
+#: lxc/config_trust.go:172 lxc/image.go:970 lxc/image.go:971
+#: lxc/image_alias.go:231
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1159,7 +1163,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:837
+#: lxc/image.go:867
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -1209,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:101 lxc/cluster.go:69 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image.go:928 lxc/image_alias.go:154
+#: lxc/config_trust.go:117 lxc/image.go:960 lxc/image_alias.go:154
 #: lxc/list.go:113 lxc/network.go:810 lxc/network.go:893 lxc/operation.go:103
 #: lxc/profile.go:580 lxc/project.go:385 lxc/remote.go:458 lxc/storage.go:509
 #: lxc/storage_volume.go:1071
@@ -1343,33 +1347,33 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1251
+#: lxc/image.go:1292
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:231
+#: lxc/image.go:240
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:558
+#: lxc/image.go:575
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1214
+#: lxc/image.go:293 lxc/image.go:1255
 msgid "Image identifier missing"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:361
 #, c-format
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:762
+#: lxc/image.go:779
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1249
+#: lxc/image.go:1290
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1381,14 +1385,14 @@ msgstr ""
 msgid "Import container backups"
 msgstr ""
 
-#: lxc/image.go:575
+#: lxc/image.go:592
 msgid ""
 "Import image into the image store\n"
 "\n"
 "Directory import is only available on Linux and must be performed as root."
 msgstr ""
 
-#: lxc/image.go:574
+#: lxc/image.go:591
 msgid "Import images into the image store"
 msgstr ""
 
@@ -1482,7 +1486,7 @@ msgstr ""
 msgid "IsSM: %s (%s)"
 msgstr ""
 
-#: lxc/image.go:135
+#: lxc/image.go:136
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -1503,12 +1507,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:857
+#: lxc/image.go:888
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:859
+#: lxc/image.go:890
 msgid "Last used: never"
 msgstr ""
 
@@ -1634,11 +1638,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:902
+#: lxc/image.go:933
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:903
+#: lxc/image.go:934
 msgid ""
 "List images\n"
 "\n"
@@ -1661,7 +1665,8 @@ msgid ""
 "    d - Description\n"
 "    a - Architecture\n"
 "    s - Size\n"
-"    u - Upload date"
+"    u - Upload date\n"
+"    t - Type"
 msgstr ""
 
 #: lxc/profile.go:575 lxc/profile.go:576
@@ -1724,7 +1729,7 @@ msgstr ""
 msgid "MTU: %d"
 msgstr ""
 
-#: lxc/image.go:133 lxc/image.go:580
+#: lxc/image.go:134 lxc/image.go:597
 msgid "Make image public"
 msgstr ""
 
@@ -1971,7 +1976,7 @@ msgstr ""
 msgid "Moving the storage volume: %s"
 msgstr ""
 
-#: lxc/image.go:592
+#: lxc/image.go:609
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -2058,7 +2063,7 @@ msgstr ""
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/image.go:136 lxc/image.go:581
+#: lxc/image.go:137 lxc/image.go:598
 msgid "New aliases to add to the image"
 msgstr ""
 
@@ -2104,7 +2109,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:665
+#: lxc/image.go:682
 msgid "Only https:// is supported for remote image import"
 msgstr ""
 
@@ -2150,7 +2155,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:940 lxc/remote.go:516
+#: lxc/image.go:972 lxc/remote.go:516
 msgid "PUBLIC"
 msgstr ""
 
@@ -2199,7 +2204,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:203 lxc/image.go:406
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2297,7 +2302,7 @@ msgstr ""
 msgid "Project %s renamed to %s"
 msgstr ""
 
-#: lxc/image.go:862
+#: lxc/image.go:893
 msgid "Properties:"
 msgstr ""
 
@@ -2305,7 +2310,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:871
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -2337,6 +2342,10 @@ msgstr ""
 msgid "Pushing %s to %s: %%s"
 msgstr ""
 
+#: lxc/image.go:451 lxc/image.go:811 lxc/image.go:1314
+msgid "Query virtual machine images"
+msgstr ""
+
 #: lxc/info.go:254 lxc/info.go:263
 #, c-format
 msgid "Read-Only: %v"
@@ -2346,7 +2355,7 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1190 lxc/image.go:1191
+#: lxc/image.go:1231 lxc/image.go:1232
 msgid "Refresh images"
 msgstr ""
 
@@ -2355,7 +2364,7 @@ msgstr ""
 msgid "Refreshing container: %s"
 msgstr ""
 
-#: lxc/image.go:1219
+#: lxc/image.go:1260
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2432,8 +2441,8 @@ msgstr ""
 msgid "Rename a cluster member"
 msgstr ""
 
-#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:245
-#: lxc/image_alias.go:246
+#: lxc/alias.go:142 lxc/alias.go:143 lxc/image_alias.go:250
+#: lxc/image_alias.go:251
 msgid "Rename aliases"
 msgstr ""
 
@@ -2522,7 +2531,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:943
+#: lxc/image.go:975
 msgid "SIZE"
 msgstr ""
 
@@ -2723,7 +2732,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1267 lxc/image.go:1268
+#: lxc/image.go:1310 lxc/image.go:1311
 msgid "Show image properties"
 msgstr ""
 
@@ -2783,7 +2792,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:788 lxc/image.go:789
+#: lxc/image.go:807 lxc/image.go:808
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2791,7 +2800,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:868
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2819,7 +2828,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:880
+#: lxc/image.go:911
 msgid "Source:"
 msgstr ""
 
@@ -2930,8 +2939,8 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/list.go:429 lxc/network.go:867 lxc/network.go:940 lxc/operation.go:158
-#: lxc/storage_volume.go:1117
+#: lxc/image.go:977 lxc/image_alias.go:232 lxc/list.go:429 lxc/network.go:867
+#: lxc/network.go:940 lxc/operation.go:158 lxc/storage_volume.go:1117
 msgid "TYPE"
 msgstr ""
 
@@ -3021,7 +3030,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:841
+#: lxc/image.go:872
 msgid "Timestamps:"
 msgstr ""
 
@@ -3073,7 +3082,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:695
+#: lxc/image.go:712
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -3083,7 +3092,7 @@ msgstr ""
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:245
+#: lxc/image.go:870 lxc/info.go:245
 #, c-format
 msgid "Type: %s"
 msgstr ""
@@ -3096,7 +3105,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:944
+#: lxc/image.go:976
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -3119,7 +3128,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:959 lxc/list.go:476
+#: lxc/image.go:992 lxc/list.go:476
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -3161,7 +3170,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:848
+#: lxc/image.go:879
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -3317,7 +3326,7 @@ msgstr ""
 msgid "copy <pool>/<volume>[/<snapshot>] <pool>/<volume>"
 msgstr ""
 
-#: lxc/image.go:124
+#: lxc/image.go:125
 msgid "copy [<remote>:]<image> <remote>:"
 msgstr ""
 
@@ -3383,7 +3392,7 @@ msgid ""
 "<snapshot>]...]"
 msgstr ""
 
-#: lxc/image.go:258
+#: lxc/image.go:267
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3435,7 +3444,7 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/image.go:832
+#: lxc/image.go:857
 msgid "disabled"
 msgstr ""
 
@@ -3455,7 +3464,7 @@ msgstr ""
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
@@ -3487,7 +3496,7 @@ msgstr ""
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
-#: lxc/image.go:834
+#: lxc/image.go:859
 msgid "enabled"
 msgstr ""
 
@@ -3511,7 +3520,7 @@ msgid ""
 "storage]"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:444
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
@@ -3555,7 +3564,7 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:590
 msgid ""
 "import <tarball>|<directory>|<URL> [<rootfs tarball>] [<remote>:] "
 "[key=value...]"
@@ -3569,7 +3578,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:787
+#: lxc/image.go:806
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3602,7 +3611,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:900 lxc/list.go:40
+#: lxc/image.go:931 lxc/list.go:40
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3688,7 +3697,7 @@ msgid ""
 "   To push /etc/hosts into the container \"foo\"."
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:323
 msgid ""
 "lxc image edit <image>\n"
 "    Launch a text editor to edit the properties\n"
@@ -3870,7 +3879,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:822 lxc/image.go:827 lxc/image.go:997
+#: lxc/image.go:847 lxc/image.go:852 lxc/image.go:1030
 msgid "no"
 msgstr ""
 
@@ -3924,7 +3933,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1189
+#: lxc/image.go:1230
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3964,7 +3973,7 @@ msgstr ""
 msgid "rename <remote> <new-name>"
 msgstr ""
 
-#: lxc/image_alias.go:243
+#: lxc/image_alias.go:248
 msgid "rename [<remote>:]<alias> <new-name>"
 msgstr ""
 
@@ -4050,7 +4059,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1309
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -4191,7 +4200,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:824 lxc/image.go:829
-#: lxc/image.go:995
+#: lxc/cluster.go:275 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/image.go:1028
 msgid "yes"
 msgstr ""


More information about the lxc-devel mailing list