[lxc-devel] [lxd/master] Bugfixes

stgraber on Github lxc-bot at linuxcontainers.org
Fri Jun 2 20:23:29 UTC 2017


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/20170602/6c9fac65/attachment.bin>
-------------- next part --------------
From 6338a6c27e98c312b5a152ff6998c896e6fbe0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Jun 2017 10:16:28 -0400
Subject: [PATCH 1/9] network: Tweak error in subnet auto detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3376

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/networks_utils.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go
index 4b69a0363..3bac33d0a 100644
--- a/lxd/networks_utils.go
+++ b/lxd/networks_utils.go
@@ -366,7 +366,7 @@ func networkRandomSubnetV4() (string, error) {
 		return cidr, nil
 	}
 
-	return "", fmt.Errorf("Unable to find a free IPv4 subnet")
+	return "", fmt.Errorf("Failed to automatically find an unused IPv4 subnet, manual configuration required")
 }
 
 func networkRandomSubnetV6() (string, error) {
@@ -388,7 +388,7 @@ func networkRandomSubnetV6() (string, error) {
 		return cidr, nil
 	}
 
-	return "", fmt.Errorf("Unable to find a free IPv6 subnet")
+	return "", fmt.Errorf("Failed to automatically find an unused IPv6 subnet, manual configuration required")
 }
 
 func networkDefaultGatewaySubnetV4() (*net.IPNet, string, error) {

From 82619ed22d56c8ad97cb042326619b7321e03393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Jun 2017 11:29:46 -0400
Subject: [PATCH 2/9] doc: Tweak storage formatting
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/storage.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/storage.md b/doc/storage.md
index 7f60f5768..941ffa3b4 100644
--- a/doc/storage.md
+++ b/doc/storage.md
@@ -5,7 +5,6 @@ Volume keys apply to any volume created in the pool unless the value is
 overridden on a per-volume basis.
 
 ## Storage pool configuration
-
 Key                             | Type      | Condition                         | Default                 | Description
 :--                             | :--       | :--                               | :--                     | :--
 size                            | string    | appropriate driver and source     | 0                       | Size of the storage pool in bytes (suffixes supported). (Currently valid for loop based pools and zfs.)
@@ -28,7 +27,6 @@ Storage pool configuration keys can be set using the lxc tool with:
     lxc storage set [<remote>:]<pool> <key> <value>
 
 ## Storage volume configuration
-
 Key                     | Type      | Condition                 | Default                               | Description
 :--                     | :--       | :--                       | :--                                   | :--
 size                    | string    | appropriate driver        | same as volume.size                   | Size of the storage volume
@@ -170,7 +168,7 @@ lxc storage create pool1 btrfs source=/dev/sdX
  - The filesystem used for the LVs is ext4 (can be configured to use xfs instead).
  - By default, all LVM storage pools use an LVM thinpool in which logical
    volumes for all LXD storage entities (images, containers, etc.) are created.
-   This behavior can be changed by setting "lvm.use_thinpool" to "false". In
+   This behavior can be changed by setting "lvm.use\_thinpool" to "false". In
    this case, LXD will use normal logical volumes for all non-container
    snapshot storage entities (images, containers etc.). This means most storage
    operations will need to fallback to rsyncing since non-thinpool logical
@@ -202,7 +200,7 @@ lxc storage create pool1 lvm source=/dev/sdX
  - Create a new pool called "pool1" using "/dev/sdX" with the LVM Volume Group called "my-pool".
 
 ```
-lxc storage create pool1 lvm source=/dev/sdX lvm.vg_name=my-pool
+lxc storage create pool1 lvm source=/dev/sdX lvm.vg\_name=my-pool
 ```
 
 ### ZFS
@@ -232,8 +230,8 @@ lxc storage create pool1 lvm source=/dev/sdX lvm.vg_name=my-pool
    a LXD zfs pool or dataset since LXD might delete them.
  - When quotas are used on a ZFS dataset LXD will set the ZFS "quota" property.
    In order to have LXD set the ZFS "refquota" property, either set
-   "zfs.use_refquota" to "true" for the given dataset or set
-   "volume.zfs.use_refquota" to true on the storage pool. The former option
+   "zfs.use\_refquota" to "true" for the given dataset or set
+   "volume.zfs.use\_refquota" to true on the storage pool. The former option
    will make LXD use refquota only for the given storage volume the latter will
    make LXD use refquota for all storage volumes in the storage pool.
 

From 59b47070ecf3fe7122ecf643b3ac9c0fb64ace9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Jun 2017 11:32:16 -0400
Subject: [PATCH 3/9] doc: Add a note for blkio limits
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3378

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/storage.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/storage.md b/doc/storage.md
index 941ffa3b4..5980d8959 100644
--- a/doc/storage.md
+++ b/doc/storage.md
@@ -110,6 +110,22 @@ The same can be done manually against any profile using (for the "default" profi
 lxc profile device add default root disk path=/ pool=default
 ```
 
+## I/O limits
+I/O limits in IOp/s or MB/s can be set on storage devices when attached to a container (see containers.md).
+
+Those are applied through the Linux "blkio" cgroup controller which makes it possible  
+to restrict I/O at the disk level (but nothing finer grained than that).
+
+Because those apply to a whole physical disk rather than a partition or path, the following restrictions apply:
+ - Limits will not apply to filesystems that are backed by virtual devices (e.g. device mapper).
+ - If a fileystem is backed by multiple block devices, each device will get the same limit.
+ - If the container is passed two disk devices that are each backed by the same disk,  
+   the limits of the two devices will be averaged.
+
+It's also worth noting that all I/O limits only apply to actual block device access,  
+so you will need to consider the filesystem's own overhead when setting limits.  
+This also means that access to cached data will not be affected by the limit.
+
 ## Notes and examples
 ### Directory
 
@@ -234,6 +250,10 @@ lxc storage create pool1 lvm source=/dev/sdX lvm.vg\_name=my-pool
    "volume.zfs.use\_refquota" to true on the storage pool. The former option
    will make LXD use refquota only for the given storage volume the latter will
    make LXD use refquota for all storage volumes in the storage pool.
+ - I/O quotas (IOps/MBs) are unlikely to affect ZFS filesystems very
+   much. That's because of ZFS being a port of a Solaris module (using SPL)
+   and not a native Linux filesystem using the Linux VFS API which is where
+   I/O limits are applied.
 
 #### The following commands can be used to create ZFS storage pools
 

From 48266113b95fc0ee23418384b16399d49d192646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Jun 2017 15:11:24 -0400
Subject: [PATCH 4/9] images: Skip cached images without auto-update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This changes dbImageSourceGetCachedFingerprint to only consider images
that match the source AND that are configured to auto-update.

Without this, LXD may pick a very seriously outdated image rather than
one which got updated over the past X hours (6 by default).

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/db_images.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/db_images.go b/lxd/db_images.go
index ac3783a78..5f81009ee 100644
--- a/lxd/db_images.go
+++ b/lxd/db_images.go
@@ -124,7 +124,7 @@ func dbImageSourceGetCachedFingerprint(db *sql.DB, server string, protocol strin
 			FROM images_source
 			INNER JOIN images
 			ON images_source.image_id=images.id
-			WHERE server=? AND protocol=? AND alias=?`
+			WHERE server=? AND protocol=? AND alias=? AND auto_update=1`
 
 	fingerprint := ""
 

From 20b0f19453261171b02ff745595e492bebe49db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Jun 2017 15:34:46 -0400
Subject: [PATCH 5/9] images: If multiple cache hits, pick the latest
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/db_images.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lxd/db_images.go b/lxd/db_images.go
index 5f81009ee..0606fe86b 100644
--- a/lxd/db_images.go
+++ b/lxd/db_images.go
@@ -124,7 +124,8 @@ func dbImageSourceGetCachedFingerprint(db *sql.DB, server string, protocol strin
 			FROM images_source
 			INNER JOIN images
 			ON images_source.image_id=images.id
-			WHERE server=? AND protocol=? AND alias=? AND auto_update=1`
+			WHERE server=? AND protocol=? AND alias=? AND auto_update=1
+			ORDER BY creation_date DESC`
 
 	fingerprint := ""
 

From f7019f47bfe032b320dc438373628271f0414a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Jun 2017 16:20:36 -0400
Subject: [PATCH 6/9] lxc: Implement "yaml" format and commonize formats
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This means that "lxc list" and "lxc image list" now behave exactly the
same and support:

 - csv
 - json
 - table
 - yaml

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/image.go | 35 +++++++++++++++++++++++++++++------
 lxc/list.go  | 24 ++++++++++++++++--------
 lxc/utils.go |  8 ++++++++
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/lxc/image.go b/lxc/image.go
index f7cfce5ef..4814563c2 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/csv"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -109,7 +110,7 @@ lxc image export [<remote>:]<image> [target]
 lxc image info [<remote>:]<image>
     Print everything LXD knows about a given image.
 
-lxc image list [<remote>:] [filter] [--format table|json]
+lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]
     List images in the LXD image store. Filters may be of the
     <key>=<value> form for property based filtering, or part of the image
     hash or part of the image alias name.
@@ -137,7 +138,7 @@ func (c *imageCmd) flags() {
 	gnuflag.BoolVar(&c.copyAliases, "copy-aliases", false, i18n.G("Copy aliases from source"))
 	gnuflag.BoolVar(&c.autoUpdate, "auto-update", false, i18n.G("Keep the image up to date after initial copy"))
 	gnuflag.Var(&c.addAliases, "alias", i18n.G("New alias to define at target"))
-	gnuflag.StringVar(&c.format, "format", "table", i18n.G("Format"))
+	gnuflag.StringVar(&c.format, "format", "table", i18n.G("Format (csv|json|table|yaml)"))
 }
 
 func (c *imageCmd) doImageAlias(config *lxd.Config, args []string) error {
@@ -616,8 +617,7 @@ func (c *imageCmd) findDescription(props map[string]string) string {
 }
 
 func (c *imageCmd) showImages(images []api.Image, filters []string) error {
-	switch c.format {
-	case listFormatTable:
+	tableData := func() [][]string {
 		data := [][]string{}
 		for _, image := range images {
 			if !c.imageShouldShow(filters, &image) {
@@ -642,6 +642,19 @@ func (c *imageCmd) showImages(images []api.Image, filters []string) error {
 			data = append(data, []string{shortest, fp, public, description, image.Architecture, size, uploaded})
 		}
 
+		sort.Sort(SortImage(data))
+		return data
+	}
+
+	switch c.format {
+	case listFormatCSV:
+		w := csv.NewWriter(os.Stdout)
+		w.WriteAll(tableData())
+		if err := w.Error(); err != nil {
+			return err
+		}
+	case listFormatTable:
+
 		table := tablewriter.NewWriter(os.Stdout)
 		table.SetAutoWrapText(false)
 		table.SetAlignment(tablewriter.ALIGN_LEFT)
@@ -654,8 +667,7 @@ func (c *imageCmd) showImages(images []api.Image, filters []string) error {
 			i18n.G("ARCH"),
 			i18n.G("SIZE"),
 			i18n.G("UPLOAD DATE")})
-		sort.Sort(SortImage(data))
-		table.AppendBulk(data)
+		table.AppendBulk(tableData())
 		table.Render()
 	case listFormatJSON:
 		data := make([]*api.Image, len(images))
@@ -667,6 +679,17 @@ func (c *imageCmd) showImages(images []api.Image, filters []string) error {
 		if err != nil {
 			return err
 		}
+	case listFormatYAML:
+		data := make([]*api.Image, len(images))
+		for i := range images {
+			data[i] = &images[i]
+		}
+
+		out, err := yaml.Marshal(data)
+		if err != nil {
+			return err
+		}
+		fmt.Printf("%s", out)
 	default:
 		return fmt.Errorf("invalid format %q", c.format)
 	}
diff --git a/lxc/list.go b/lxc/list.go
index 98e8bc418..d4a465df5 100644
--- a/lxc/list.go
+++ b/lxc/list.go
@@ -12,6 +12,7 @@ import (
 	"sync"
 
 	"github.com/olekukonko/tablewriter"
+	"gopkg.in/yaml.v2"
 
 	"github.com/lxc/lxd"
 	"github.com/lxc/lxd/shared"
@@ -29,12 +30,6 @@ type column struct {
 
 type columnData func(api.Container, *api.ContainerState, []api.ContainerSnapshot) string
 
-const (
-	listFormatTable = "table"
-	listFormatJSON  = "json"
-	listFormatCSV   = "csv"
-)
-
 type listCmd struct {
 	columnsRaw string
 	fast       bool
@@ -47,7 +42,7 @@ func (c *listCmd) showByDefault() bool {
 
 func (c *listCmd) usage() string {
 	return i18n.G(
-		`Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c <columns>] [--fast]
+		`Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c <columns>] [--fast]
 
 List the existing containers.
 
@@ -132,7 +127,7 @@ lxc list -c ns,user.comment:comment
 func (c *listCmd) flags() {
 	gnuflag.StringVar(&c.columnsRaw, "c", "ns46tS", i18n.G("Columns"))
 	gnuflag.StringVar(&c.columnsRaw, "columns", "ns46tS", i18n.G("Columns"))
-	gnuflag.StringVar(&c.format, "format", "table", i18n.G("Format (table|json|csv)"))
+	gnuflag.StringVar(&c.format, "format", "table", i18n.G("Format (csv|json|table|yaml)"))
 	gnuflag.BoolVar(&c.fast, "fast", false, i18n.G("Fast mode (same as --columns=nsacPt)"))
 }
 
@@ -378,6 +373,19 @@ func (c *listCmd) listContainers(d *lxd.Client, cinfos []api.Container, filters
 		if err != nil {
 			return err
 		}
+	case listFormatYAML:
+		data := make([]listContainerItem, len(cinfos))
+		for i := range cinfos {
+			data[i].Container = &cinfos[i]
+			data[i].State = cStates[cinfos[i].Name]
+			data[i].Snapshots = cSnapshots[cinfos[i].Name]
+		}
+
+		out, err := yaml.Marshal(data)
+		if err != nil {
+			return err
+		}
+		fmt.Printf("%s", out)
 	default:
 		return fmt.Errorf("invalid format %q", c.format)
 	}
diff --git a/lxc/utils.go b/lxc/utils.go
index e9c01873a..96d74d7a3 100644
--- a/lxc/utils.go
+++ b/lxc/utils.go
@@ -9,6 +9,14 @@ import (
 	"github.com/lxc/lxd/shared/i18n"
 )
 
+// Lists
+const (
+	listFormatCSV   = "csv"
+	listFormatJSON  = "json"
+	listFormatTable = "table"
+	listFormatYAML  = "yaml"
+)
+
 // Progress tracking
 type ProgressRenderer struct {
 	Format string

From de75562d2d899758fa8b194b463ff8bc28be55ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 1 Jun 2017 22:06:37 -0400
Subject: [PATCH 7/9] shared/api: Extensions go at the bottom
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/container.go | 12 ++++++------
 shared/api/network.go   |  4 ++--
 shared/api/storage.go   |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/shared/api/container.go b/shared/api/container.go
index a9d916164..a300a0731 100644
--- a/shared/api/container.go
+++ b/shared/api/container.go
@@ -29,9 +29,6 @@ type ContainerPost struct {
 
 // ContainerPut represents the modifiable fields of a LXD container
 type ContainerPut struct {
-	// API extension: entity_description
-	Description string `json:"description" yaml:"description"`
-
 	Architecture string                       `json:"architecture" yaml:"architecture"`
 	Config       map[string]string            `json:"config" yaml:"config"`
 	Devices      map[string]map[string]string `json:"devices" yaml:"devices"`
@@ -41,6 +38,9 @@ type ContainerPut struct {
 	// For snapshot restore
 	Restore  string `json:"restore,omitempty" yaml:"restore,omitempty"`
 	Stateful bool   `json:"stateful" yaml:"stateful"`
+
+	// API extension: entity_description
+	Description string `json:"description" yaml:"description"`
 }
 
 // Container represents a LXD container
@@ -96,12 +96,12 @@ type ContainerSource struct {
 	Operation  string            `json:"operation,omitempty" yaml:"operation,omitempty"`
 	Websockets map[string]string `json:"secrets,omitempty" yaml:"secrets,omitempty"`
 
-	// API extension: container_push
-	Live bool `json:"live,omitempty" yaml:"live,omitempty"`
-
 	// For "copy" type
 	Source string `json:"source,omitempty" yaml:"source,omitempty"`
 
+	// API extension: container_push
+	Live bool `json:"live,omitempty" yaml:"live,omitempty"`
+
 	// API extension: container_only_migration
 	ContainerOnly bool `json:"container_only,omitempty" yaml:"container_only,omitempty"`
 }
diff --git a/shared/api/network.go b/shared/api/network.go
index 2b390ff23..4fe3e8705 100644
--- a/shared/api/network.go
+++ b/shared/api/network.go
@@ -22,10 +22,10 @@ type NetworkPost struct {
 //
 // API extension: network
 type NetworkPut struct {
+	Config map[string]string `json:"config" yaml:"config"`
+
 	// API extension: entity_description
 	Description string `json:"description" yaml:"description"`
-
-	Config map[string]string `json:"config" yaml:"config"`
 }
 
 // Network represents a LXD network
diff --git a/shared/api/storage.go b/shared/api/storage.go
index 7a1be284b..f598ae8b0 100644
--- a/shared/api/storage.go
+++ b/shared/api/storage.go
@@ -25,10 +25,10 @@ type StoragePool struct {
 //
 // API extension: storage
 type StoragePoolPut struct {
+	Config map[string]string `json:"config" yaml:"config"`
+
 	// API extension: entity_description
 	Description string `json:"description" yaml:"description"`
-
-	Config map[string]string `json:"config" yaml:"config"`
 }
 
 // StorageVolumesPost represents the fields of a new LXD storage pool volume
@@ -55,10 +55,10 @@ type StorageVolume struct {
 //
 // API extension: storage
 type StorageVolumePut struct {
+	Config map[string]string `json:"config" yaml:"config"`
+
 	// API extension: entity_description
 	Description string `json:"description" yaml:"description"`
-
-	Config map[string]string `json:"config" yaml:"config"`
 }
 
 // Writable converts a full StoragePool struct into a StoragePoolPut struct

From 9d821730ababdd1db4b274b927e5897eaa6ce099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Jun 2017 01:09:08 -0400
Subject: [PATCH 8/9] Makefile: Update pot before po
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>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ab0a295fa..a2e77ec15 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ dist:
 	rm -Rf $(TMP)
 
 .PHONY: i18n update-po update-pot build-mo static-analysis
-i18n: update-po update-pot
+i18n: update-pot update-po
 
 po/%.mo: po/%.po
 	msgfmt --statistics -o $@ $<

From 365053d1d6046ac0c52c244957807850c01f3ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Jun 2017 16:21:46 -0400
Subject: [PATCH 9/9] i18n: Update for modified strings
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/de.po   | 138 +++++++++++++++++++++++++++++------------------------------
 po/el.po   | 138 +++++++++++++++++++++++++++++------------------------------
 po/fr.po   | 141 ++++++++++++++++++++++++++++++-------------------------------
 po/it.po   | 138 +++++++++++++++++++++++++++++------------------------------
 po/ja.po   | 141 ++++++++++++++++++++++++++++++-------------------------------
 po/lxd.pot | 138 +++++++++++++++++++++++++++++------------------------------
 po/nl.po   | 138 +++++++++++++++++++++++++++++------------------------------
 po/ru.po   | 138 +++++++++++++++++++++++++++++------------------------------
 po/sr.po   | 138 +++++++++++++++++++++++++++++------------------------------
 po/sv.po   | 138 +++++++++++++++++++++++++++++------------------------------
 po/tr.po   | 138 +++++++++++++++++++++++++++++------------------------------
 11 files changed, 743 insertions(+), 781 deletions(-)

diff --git a/po/de.po b/po/de.po
index 7825661b7..a3171292c 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: 2017-02-14 17:11+0000\n"
 "Last-Translator: Tim Rose <tim at netlope.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -114,7 +114,7 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 #, fuzzy
 msgid ""
 "### This is a yaml representation of the image properties.\n"
@@ -222,15 +222,15 @@ msgstr "'/' ist kein gültiges Zeichen im Namen eines Sicherungspunktes\n"
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -243,17 +243,17 @@ msgstr "Akzeptiere Zertifikat"
 msgid "Admin password for %s: "
 msgstr "Administrator Passwort für %s: "
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 #, fuzzy
 msgid "Aliases:"
 msgstr "Aliasse:\n"
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, fuzzy, c-format
 msgid "Architecture: %s"
 msgstr "Architektur: %s\n"
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr "automatisches Update: %s"
@@ -279,7 +279,7 @@ msgstr ""
 msgid "CPU usage:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr "ERSTELLT AM"
 
@@ -306,7 +306,7 @@ msgstr "Fingerabdruck des Zertifikats: % x\n"
 msgid "Client certificate stored at server: "
 msgstr "Gespeichertes Nutzerzertifikat auf dem Server: "
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr ""
 
@@ -319,7 +319,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, fuzzy, c-format
 msgid "Config parsing error: %s"
@@ -343,7 +343,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr "Kopiere Aliasse von der Quelle"
 
@@ -352,7 +352,7 @@ msgstr "Kopiere Aliasse von der Quelle"
 msgid "Copy the container without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -365,7 +365,7 @@ msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
 msgid "Disk usage:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -450,16 +450,16 @@ msgstr "Flüchtiger Container"
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -473,11 +473,11 @@ msgstr ""
 msgid "Failed to generate 'lxc.1': %v"
 msgstr ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, fuzzy, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerabdruck: %s\n"
@@ -499,12 +499,8 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr ""
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
@@ -512,11 +508,11 @@ msgstr ""
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "Generiere Nutzerzertifikat. Dies kann wenige Minuten dauern...\n"
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr ""
 
@@ -537,24 +533,24 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, fuzzy, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid "Image refreshed successfully!"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -592,11 +588,11 @@ msgstr "Ungültiges Ziel %s"
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -604,12 +600,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr ""
 
@@ -621,7 +617,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr "Veröffentliche Abbild"
 
@@ -652,7 +648,7 @@ msgstr ""
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr "Fehlende Zusammenfassung."
 
@@ -675,7 +671,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Must supply container name for: "
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -708,7 +704,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
@@ -739,7 +735,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -751,7 +747,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -760,15 +756,15 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -776,7 +772,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -816,7 +812,7 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr "Profil %s wurde auf %s angewandt\n"
 msgid "Profiles: %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 #, fuzzy
 msgid "Properties:"
 msgstr "Eigenschaften:\n"
@@ -881,7 +877,7 @@ msgstr "Eigenschaften:\n"
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, fuzzy, c-format
 msgid "Public: %s"
 msgstr "Öffentlich: %s\n"
@@ -890,7 +886,7 @@ msgstr "Öffentlich: %s\n"
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -927,11 +923,11 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -939,7 +935,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -947,7 +943,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -992,7 +988,7 @@ msgstr "Zeige die letzten 100 Zeilen Protokoll des Containers?"
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, fuzzy, c-format
 msgid "Size: %.2fMB"
 msgstr "Größe: %.2vMB\n"
@@ -1006,7 +1002,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr ""
 
@@ -1076,7 +1072,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1136,7 +1132,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "Wartezeit bevor der Container gestoppt wird."
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 #, fuzzy
 msgid "Timestamps:"
 msgstr "Zeitstempel:\n"
@@ -1153,7 +1149,7 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1171,7 +1167,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1191,7 +1187,7 @@ msgstr ""
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1418,7 +1414,7 @@ msgid ""
 "Help page for the LXD client."
 msgstr ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
 "\n"
@@ -1472,7 +1468,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1563,10 +1559,10 @@ msgstr ""
 "Beispiel:\n"
 "lxc launch ubuntu u1\n"
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 #, fuzzy
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -2139,11 +2135,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr ""
 
@@ -2161,7 +2157,7 @@ msgstr "Fehler: unbekannter Befehl: %s\n"
 msgid "got bad version"
 msgstr "Versionskonflikt"
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -2224,7 +2220,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr "falsche Anzahl an Parametern für Unterbefehl"
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index ab4b8c579..5430309fa 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -71,7 +71,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -135,15 +135,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -156,16 +156,16 @@ msgstr ""
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "CPU usage:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr ""
 
@@ -218,7 +218,7 @@ msgstr ""
 msgid "Client certificate stored at server: "
 msgstr ""
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -254,7 +254,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -262,7 +262,7 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -325,7 +325,7 @@ msgstr ""
 msgid "Disk usage:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -357,16 +357,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -380,11 +380,11 @@ msgstr ""
 msgid "Failed to generate 'lxc.1': %v"
 msgstr ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -405,23 +405,19 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr ""
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr ""
 
@@ -441,24 +437,24 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid "Image refreshed successfully!"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -495,11 +491,11 @@ msgstr ""
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -507,12 +503,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr ""
 
@@ -524,7 +520,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr ""
 
@@ -555,7 +551,7 @@ msgstr ""
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr ""
 
@@ -575,7 +571,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -608,7 +604,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr "  Χρήση δικτύου:"
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
@@ -636,7 +632,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -648,7 +644,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -657,15 +653,15 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -673,7 +669,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -710,7 +706,7 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -765,7 +761,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr ""
 
@@ -773,7 +769,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -782,7 +778,7 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -818,11 +814,11 @@ msgstr ""
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -830,7 +826,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -838,7 +834,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -882,7 +878,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -896,7 +892,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr ""
 
@@ -962,7 +958,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1018,7 +1014,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr ""
 
@@ -1034,7 +1030,7 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1052,7 +1048,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1072,7 +1068,7 @@ msgstr ""
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1238,7 +1234,7 @@ msgid ""
 "Help page for the LXD client."
 msgstr ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
 "\n"
@@ -1292,7 +1288,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1359,9 +1355,9 @@ msgid ""
 "    lxc launch ubuntu:16.04 u1"
 msgstr ""
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -1857,11 +1853,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr ""
 
@@ -1879,7 +1875,7 @@ msgstr ""
 msgid "got bad version"
 msgstr ""
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -1941,7 +1937,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 1b36e6149..73ae19c64 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: 2017-03-30 21:35+0000\n"
 "Last-Translator: HazWard <starlysolon at gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -109,7 +109,7 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -212,15 +212,15 @@ msgstr "'/' n'est pas autorisé dans le nom d'un instantané"
 msgid "(none)"
 msgstr "(aucun)"
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr "ARCH"
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTURE"
 
@@ -233,16 +233,16 @@ msgstr "Accepter le certificat"
 msgid "Admin password for %s: "
 msgstr "Mot de passe administrateur pour %s : "
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr "Alias :"
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architecture : %s"
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr "Mise à jour auto. : %s"
@@ -267,7 +267,7 @@ msgstr "CPU utilisé (en secondes)"
 msgid "CPU usage:"
 msgstr "CPU utilisé :"
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr "CRÉÉ À"
 
@@ -295,7 +295,7 @@ msgstr "Empreinte du certificat : %x"
 msgid "Client certificate stored at server: "
 msgstr "Certificat client enregistré sur le serveur : "
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr "Colonnes"
 
@@ -307,7 +307,7 @@ msgstr "Commandes:"
 msgid "Config key/value to apply to the new container"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -331,7 +331,7 @@ msgstr "Le nom du conteneur est : %s"
 msgid "Container published with fingerprint: %s"
 msgstr "Conteneur publié avec l'empreinte : %s"
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr "Copier les alias depuis la source"
 
@@ -340,7 +340,7 @@ msgstr "Copier les alias depuis la source"
 msgid "Copy the container without its snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Copie de l'image : %s"
@@ -353,7 +353,7 @@ msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 msgid "Create any directories necessary"
 msgstr "Créer tous répertoires nécessaires"
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr "Créé : %s"
@@ -367,7 +367,7 @@ msgstr "Création de %s"
 msgid "Creating the container"
 msgstr "Création du conteneur"
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -403,7 +403,7 @@ msgstr "Désactiver stdin (lecture à partir de /dev/null)"
 msgid "Disk usage:"
 msgstr "  Disque utilisé :"
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr "ÉPHÉMÈRE"
 
@@ -435,16 +435,16 @@ msgstr "Conteneur éphémère"
 msgid "Event type to listen for"
 msgstr "Type d'évènements à surveiller"
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr "Expire : %s"
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr "N'expire jamais"
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
@@ -458,12 +458,12 @@ msgstr "Échec lors de la génération de 'lxc.%s.1': %v"
 msgid "Failed to generate 'lxc.1': %v"
 msgstr "Échec lors de la génération de 'lxc.1': %v"
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 #, fuzzy
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr "Mode rapide (identique à --columns=nsacPt"
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Empreinte : %s"
@@ -484,23 +484,19 @@ msgstr "Forcer la suppression des conteneurs arrêtés"
 msgid "Force using the local unix socket"
 msgstr "Forcer l'utilisation de la socket unix locale"
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr "Format"
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "Génération d'un certificat client. Ceci peut prendre une minute…"
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr "IPv4"
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr "IPv6"
 
@@ -523,25 +519,25 @@ msgstr "Ignorer les alias pour déterminer la commande à exécuter"
 msgid "Ignore the container state (only for start)"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Image importée avec l'empreinte : %s"
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 #, fuzzy
 msgid "Image refreshed successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr "Import de l'image : %s"
@@ -578,11 +574,11 @@ msgstr "Cible invalide %s"
 msgid "Ips:"
 msgstr "IPs :"
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr "Garder l'image à jour après la copie initiale"
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr "DERNIÈRE UTILISATION À"
 
@@ -590,12 +586,12 @@ msgstr "DERNIÈRE UTILISATION À"
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr "Socket LXD introuvable ; LXD est-il installé et actif ?"
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr "Dernière utilisation : %s"
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr "Dernière utilisation : jamais"
 
@@ -607,7 +603,7 @@ msgstr "Journal : "
 msgid "MANAGED"
 msgstr "GÉRÉ"
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr "Rendre l'image publique"
 
@@ -638,7 +634,7 @@ msgstr "Échec lors de la migration vers l'hôte source: %s"
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr "Résumé manquant."
 
@@ -660,7 +656,7 @@ msgstr "Forcer le conteneur à s'arrêter"
 msgid "Must supply container name for: "
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr "NOM"
@@ -693,7 +689,7 @@ msgstr "Nom du réseau"
 msgid "Network usage:"
 msgstr "  Réseau utilisé :"
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr "Nouvel alias à définir sur la cible"
 
@@ -722,7 +718,7 @@ msgstr "Seul les volumes \"personnalisés\" peuvent être attaché aux conteneur
 msgid "Only https URLs are supported for simplestreams"
 msgstr "Seules les URLs https sont supportées par simplestreams"
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr "Seul https:// est supporté par l'import d'images distantes."
 
@@ -734,7 +730,7 @@ msgstr "Seuls les réseaux gérés par LXD peuvent être modifiés."
 msgid "Options:"
 msgstr "Options :"
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr "Le résultat est dans %s"
@@ -743,15 +739,15 @@ msgstr "Le résultat est dans %s"
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr "Surcharger le mode terminal (auto, interactif ou non-interactif)"
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr "PERSISTANT"
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr "PID"
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr "PROFILS"
 
@@ -759,7 +755,7 @@ msgstr "PROFILS"
 msgid "PROTOCOL"
 msgstr "PROTOCOLE"
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr "PUBLIC"
 
@@ -797,7 +793,7 @@ msgstr "Pid : %d"
 msgid "Press enter to open the editor again"
 msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr "Appuyer sur Entrée pour lancer à nouveau l'éditeur"
 
@@ -852,7 +848,7 @@ msgstr "Profils %s appliqués à %s"
 msgid "Profiles: %s"
 msgstr "Profils : %s"
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr "Propriétés :"
 
@@ -860,7 +856,7 @@ msgstr "Propriétés :"
 msgid "Public image server"
 msgstr "Serveur d'images public"
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr "Public : %s"
@@ -869,7 +865,7 @@ msgstr "Public : %s"
 msgid "Recursively push or pull files"
 msgstr "Pousser ou récupérer des fichiers récursivement"
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "Récupération de l'image : %s"
@@ -906,11 +902,11 @@ msgstr "Création du conteneur"
 msgid "Retrieving image: %s"
 msgstr "Récupération de l'image : %s"
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr "TAILLE"
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr "INSTANTANÉS"
 
@@ -918,7 +914,7 @@ msgstr "INSTANTANÉS"
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr "ÉTAT"
 
@@ -926,7 +922,7 @@ msgstr "ÉTAT"
 msgid "STATIC"
 msgstr "STATIQUE"
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr "ENSEMBLE DE STOCKAGE"
 
@@ -971,7 +967,7 @@ msgstr "Afficher les 100 dernières lignes du journal du conteneur ?"
 msgid "Show the expanded configuration"
 msgstr "Afficher la configuration étendue"
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "Taille : %.2f Mo"
@@ -985,7 +981,7 @@ msgstr "Instantanés :"
 msgid "Some containers failed to %s"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr "Source :"
 
@@ -1053,7 +1049,7 @@ msgstr "Swap (courant)"
 msgid "Swap (peak)"
 msgstr "Swap (pointe)"
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr "TYPE"
 
@@ -1120,7 +1116,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:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr "Horodatage :"
 
@@ -1137,7 +1133,7 @@ msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 "Pour démarrer votre premier conteneur, essayer : lxc launch ubuntu:16.04"
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr "Transfert de l'image : %s"
@@ -1155,7 +1151,7 @@ msgstr "Type : éphémère"
 msgid "Type: persistent"
 msgstr "Type : persistant"
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
@@ -1175,7 +1171,7 @@ msgstr "Impossible de trouver help2man"
 msgid "Unable to read remote TLS certificate"
 msgstr "Impossible de lire le certificat TLS distant"
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr "Publié : %s"
@@ -1448,7 +1444,7 @@ msgstr ""
 "\n"
 "Page d'aide pour le client LXD."
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 #, fuzzy
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
@@ -1503,7 +1499,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1682,10 +1678,10 @@ msgstr ""
 "Exemple :\n"
 "    lxc launch ubuntu:16.04 u1"
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 #, fuzzy
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -2417,11 +2413,11 @@ msgstr "par défaut"
 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:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr "désactivé"
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr "activé"
 
@@ -2439,7 +2435,7 @@ msgstr "erreur : commande inconnue: %s"
 msgid "got bad version"
 msgstr "reçu une mauvaise version"
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr "non"
 
@@ -2501,7 +2497,7 @@ msgstr "Un retour impossible à été renvoyé"
 msgid "wrong number of subcommand arguments"
 msgstr "nombre d'arguments incorrect pour la sous-comande"
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr "oui"
 
@@ -2509,6 +2505,9 @@ msgstr "oui"
 msgid "you must specify a source container name"
 msgstr "vous devez spécifier un nom de conteneur source"
 
+#~ msgid "Format"
+#~ msgstr "Format"
+
 #~ msgid "Could not sanitize path %s"
 #~ msgstr "Impossible d'assainir le chemin %s"
 
diff --git a/po/it.po b/po/it.po
index da10b5037..c977b4051 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: 2017-05-09 20:42+0000\n"
 "Last-Translator: Alberto Donato <alberto.donato at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -71,7 +71,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -135,15 +135,15 @@ msgstr "'/' non è permesso nel nome di uno snapshot"
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr "ARCH"
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr "ARCHITETTURA"
 
@@ -156,16 +156,16 @@ msgstr ""
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -190,7 +190,7 @@ msgstr ""
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr ""
 
@@ -217,7 +217,7 @@ msgstr ""
 msgid "Client certificate stored at server: "
 msgstr ""
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr ""
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -253,7 +253,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -323,7 +323,7 @@ msgstr ""
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -355,16 +355,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -378,11 +378,11 @@ msgstr ""
 msgid "Failed to generate 'lxc.1': %v"
 msgstr ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -403,23 +403,19 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr ""
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr ""
 
@@ -439,24 +435,24 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid "Image refreshed successfully!"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -493,11 +489,11 @@ msgstr ""
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -505,12 +501,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr ""
 
@@ -552,7 +548,7 @@ msgstr ""
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr ""
 
@@ -572,7 +568,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -604,7 +600,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
@@ -632,7 +628,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -644,7 +640,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -653,15 +649,15 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -669,7 +665,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -706,7 +702,7 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -761,7 +757,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr ""
 
@@ -769,7 +765,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -778,7 +774,7 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -814,11 +810,11 @@ msgstr ""
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -826,7 +822,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -834,7 +830,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -878,7 +874,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -892,7 +888,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr ""
 
@@ -958,7 +954,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1014,7 +1010,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr ""
 
@@ -1030,7 +1026,7 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1048,7 +1044,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1068,7 +1064,7 @@ msgstr ""
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1234,7 +1230,7 @@ msgid ""
 "Help page for the LXD client."
 msgstr ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
 "\n"
@@ -1288,7 +1284,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1355,9 +1351,9 @@ msgid ""
 "    lxc launch ubuntu:16.04 u1"
 msgstr ""
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -1853,11 +1849,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr ""
 
@@ -1875,7 +1871,7 @@ msgstr ""
 msgid "got bad version"
 msgstr ""
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -1937,7 +1933,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 9a4e5333d..dc106c234 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: 2017-03-23 12:03+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -71,7 +71,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -135,15 +135,15 @@ msgstr "'/' はスナップショットの名前には使用できません"
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -156,16 +156,16 @@ msgstr "証明書を受け入れます"
 msgid "Admin password for %s: "
 msgstr "%s の管理者パスワード: "
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr "エイリアス:"
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr "アーキテクチャ: %s"
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr "自動更新: %s"
@@ -190,7 +190,7 @@ msgstr "CPU使用量(秒)"
 msgid "CPU usage:"
 msgstr "CPU使用量:"
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr ""
 
@@ -217,7 +217,7 @@ msgstr "証明書のフィンガープリント: %x"
 msgid "Client certificate stored at server: "
 msgstr "クライアント証明書がサーバに格納されました: "
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr "カラムレイアウト"
 
@@ -229,7 +229,7 @@ msgstr "コマンド:"
 msgid "Config key/value to apply to the new container"
 msgstr "新しいコンテナに適用するキー/値の設定"
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -253,7 +253,7 @@ msgstr "コンテナ名: %s"
 msgid "Container published with fingerprint: %s"
 msgstr "コンテナは以下のフィンガープリントで publish されます: %s"
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr "ソースからエイリアスをコピーしました"
 
@@ -262,7 +262,7 @@ msgstr "ソースからエイリアスをコピーしました"
 msgid "Copy the container without its snapshots"
 msgstr "コンテナを強制シャットダウンします"
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr "イメージのコピー中: %s"
@@ -275,7 +275,7 @@ msgstr "サーバ証明書格納用のディレクトリを作成できません
 msgid "Create any directories necessary"
 msgstr "必要なディレクトリをすべて作成します"
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr "作成日時: %s"
@@ -289,7 +289,7 @@ msgstr "%s を作成中"
 msgid "Creating the container"
 msgstr "コンテナを作成中"
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -324,7 +324,7 @@ msgstr "標準入力を無効にします (/dev/null から読み込みます)"
 msgid "Disk usage:"
 msgstr "ディスク使用量:"
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -356,16 +356,16 @@ msgstr "Ephemeral コンテナ"
 msgid "Event type to listen for"
 msgstr "Listenするイベントタイプ"
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr "失効日時: %s"
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr "失効日時: 失効しない"
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -379,12 +379,12 @@ msgstr "'lxc.%s.1' の生成が失敗しました: %v"
 msgid "Failed to generate 'lxc.1': %v"
 msgstr "'lxc.1' の生成が失敗しました: %v"
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 #, fuzzy
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr "Fast モード (--columns=nsacPt と同じ)"
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
@@ -405,23 +405,19 @@ msgstr "停止したコンテナを強制的に削除します"
 msgid "Force using the local unix socket"
 msgstr "強制的にローカルのUNIXソケットを使います"
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr "フォーマット"
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "クライアント証明書を生成します。1分ぐらいかかります..."
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr "IPV4"
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr "IPV6"
 
@@ -441,25 +437,25 @@ msgstr "どのコマンドを実行するか決める際にエイリアスを無
 msgid "Ignore the container state (only for start)"
 msgstr "コンテナの状態を無視します (startのみ)"
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr "イメージのコピーが成功しました!"
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "イメージは以下のフィンガープリントでインポートされました: %s"
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 #, fuzzy
 msgid "Image refreshed successfully!"
 msgstr "イメージのコピーが成功しました!"
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr "イメージのインポート中: %s"
@@ -496,11 +492,11 @@ msgstr "不正な送り先 %s"
 msgid "Ips:"
 msgstr "IPアドレス:"
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr "最初にコピーした後も常にイメージを最新の状態に保つ"
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -508,12 +504,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr "LXD のソケットが見つかりません。LXD が実行されていますか?"
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr "最終使用: %s"
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr "最終使用: 未使用"
 
@@ -525,7 +521,7 @@ msgstr "ログ:"
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr "イメージを public にする"
 
@@ -555,7 +551,7 @@ msgstr "ソースのホスト上でマイグレーションが失敗しました
 msgid "Migration failed on target host: %s"
 msgstr "コピー先のホストでマイグレーションが失敗しました: %s"
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr "サマリーはありません。"
 
@@ -578,7 +574,7 @@ msgstr "コンテナを強制シャットダウンします"
 msgid "Must supply container name for: "
 msgstr "コンテナ名を指定する必要があります: "
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -610,7 +606,7 @@ msgstr "ネットワーク名:"
 msgid "Network usage:"
 msgstr "ネットワーク使用状況:"
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr "新しいエイリアスを定義する"
 
@@ -638,7 +634,7 @@ msgstr "\"カスタム\" のボリュームのみがコンテナにアタッチ
 msgid "Only https URLs are supported for simplestreams"
 msgstr "simplestreams は https の URL のみサポートします"
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr "リモートイメージのインポートは https:// のみをサポートします。"
 
@@ -650,7 +646,7 @@ msgstr "管理対象のネットワークのみ変更できます。"
 msgid "Options:"
 msgstr "オプション:"
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr "%s に出力されます"
@@ -659,15 +655,15 @@ msgstr "%s に出力されます"
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr "ターミナルモードを上書きします (auto, interactive, non-interactive)"
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr "PID"
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -675,7 +671,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -712,7 +708,7 @@ msgstr "Pid: %d"
 msgid "Press enter to open the editor again"
 msgstr "再度エディタを開くためには Enter キーを押します"
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr "再度エディタを起動するには Enter キーを押します"
 
@@ -767,7 +763,7 @@ msgstr "プロファイル %s が %s に追加されました"
 msgid "Profiles: %s"
 msgstr "プロファイル: %s"
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr "プロパティ:"
 
@@ -775,7 +771,7 @@ msgstr "プロパティ:"
 msgid "Public image server"
 msgstr "Public なイメージサーバとして設定します"
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr "パブリック: %s"
@@ -784,7 +780,7 @@ msgstr "パブリック: %s"
 msgid "Recursively push or pull files"
 msgstr "再帰的にファイルをpush/pullします"
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "イメージの取得中: %s"
@@ -820,11 +816,11 @@ msgstr "コンテナを再起動します。"
 msgid "Retrieving image: %s"
 msgstr "イメージの取得中: %s"
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -832,7 +828,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -840,7 +836,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -884,7 +880,7 @@ msgstr "コンテナログの最後の 100 行を表示しますか?"
 msgid "Show the expanded configuration"
 msgstr "拡張した設定を表示する"
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "サイズ: %.2fMB"
@@ -898,7 +894,7 @@ msgstr "スナップショット:"
 msgid "Some containers failed to %s"
 msgstr "一部のコンテナで %s が失敗しました"
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr "取得元:"
 
@@ -964,7 +960,7 @@ msgstr "Swap (現在値)"
 msgid "Swap (peak)"
 msgstr "Swap (ピーク)"
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1029,7 +1025,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "コンテナを強制停止するまでの時間"
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr "タイムスタンプ:"
 
@@ -1049,7 +1045,7 @@ msgstr ""
 "初めてコンテナを起動するには、\"lxc launch ubuntu:16.04\" と実行してみてくだ"
 "さい"
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr "イメージを転送中: %s"
@@ -1067,7 +1063,7 @@ msgstr "タイプ: ephemeral"
 msgid "Type: persistent"
 msgstr "タイプ: persistent"
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1087,7 +1083,7 @@ msgstr "help2man が見つかりません。"
 msgid "Unable to read remote TLS certificate"
 msgstr "リモートの TLS 証明書を読めません"
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr "アップロード日時: %s"
@@ -1364,7 +1360,7 @@ msgstr ""
 "\n"
 "LXD クライアントのヘルプを表示します。"
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 #, fuzzy
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
@@ -1419,7 +1415,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1590,10 +1586,10 @@ msgstr ""
 "例:\n"
 "    lxc launch ubuntu:16.04 u1"
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 #, fuzzy
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -2481,11 +2477,11 @@ msgstr ""
 "サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
 "した"
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr "無効"
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr "有効"
 
@@ -2503,7 +2499,7 @@ msgstr "エラー: 未知のコマンド: %s"
 msgid "got bad version"
 msgstr "不正なバージョンを得ました"
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -2565,7 +2561,7 @@ msgstr "到達しないはずのreturnに到達しました"
 msgid "wrong number of subcommand arguments"
 msgstr "サブコマンドの引数の数が正しくありません"
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 
@@ -2573,6 +2569,9 @@ msgstr ""
 msgid "you must specify a source container name"
 msgstr "コピー元のコンテナ名を指定してください"
 
+#~ msgid "Format"
+#~ msgstr "フォーマット"
+
 #~ msgid "Could not sanitize path %s"
 #~ msgstr "パス %s をサニタイズできません"
 
diff --git a/po/lxd.pot b/po/lxd.pot
index e0389c3c4..3545adbda 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: 2017-05-30 14:59-0400\n"
+        "POT-Creation-Date: 2017-06-02 16:22-0400\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -65,7 +65,7 @@ msgid   "### This is a yaml representation of the configuration.\n"
         "### Note that the name is shown but cannot be changed"
 msgstr  ""
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid   "### This is a yaml representation of the image properties.\n"
         "### Any line starting with a '# will be ignored.\n"
         "###\n"
@@ -126,15 +126,15 @@ msgstr  ""
 msgid   "(none)"
 msgstr  ""
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid   "ALIAS"
 msgstr  ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid   "ARCH"
 msgstr  ""
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid   "ARCHITECTURE"
 msgstr  ""
 
@@ -147,16 +147,16 @@ msgstr  ""
 msgid   "Admin password for %s: "
 msgstr  ""
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid   "Aliases:"
 msgstr  ""
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid   "Architecture: %s"
 msgstr  ""
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid   "Auto update: %s"
 msgstr  ""
@@ -181,7 +181,7 @@ msgstr  ""
 msgid   "CPU usage:"
 msgstr  ""
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid   "CREATED AT"
 msgstr  ""
 
@@ -208,7 +208,7 @@ msgstr  ""
 msgid   "Client certificate stored at server: "
 msgstr  ""
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid   "Columns"
 msgstr  ""
 
@@ -220,7 +220,7 @@ msgstr  ""
 msgid   "Config key/value to apply to the new container"
 msgstr  ""
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378 lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378 lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid   "Config parsing error: %s"
 msgstr  ""
@@ -243,7 +243,7 @@ msgstr  ""
 msgid   "Container published with fingerprint: %s"
 msgstr  ""
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid   "Copy aliases from source"
 msgstr  ""
 
@@ -251,7 +251,7 @@ msgstr  ""
 msgid   "Copy the container without its snapshots"
 msgstr  ""
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid   "Copying the image: %s"
 msgstr  ""
@@ -264,7 +264,7 @@ msgstr  ""
 msgid   "Create any directories necessary"
 msgstr  ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid   "Created: %s"
 msgstr  ""
@@ -278,7 +278,7 @@ msgstr  ""
 msgid   "Creating the container"
 msgstr  ""
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461 lxc/storage.go:608 lxc/storage.go:697
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461 lxc/storage.go:608 lxc/storage.go:697
 msgid   "DESCRIPTION"
 msgstr  ""
 
@@ -312,7 +312,7 @@ msgstr  ""
 msgid   "Disk usage:"
 msgstr  ""
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid   "EPHEMERAL"
 msgstr  ""
 
@@ -344,16 +344,16 @@ msgstr  ""
 msgid   "Event type to listen for"
 msgstr  ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid   "Expires: %s"
 msgstr  ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid   "Expires: never"
 msgstr  ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid   "FINGERPRINT"
 msgstr  ""
 
@@ -367,11 +367,11 @@ msgstr  ""
 msgid   "Failed to generate 'lxc.1': %v"
 msgstr  ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid   "Fast mode (same as --columns=nsacPt)"
 msgstr  ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid   "Fingerprint: %s"
 msgstr  ""
@@ -392,23 +392,19 @@ msgstr  ""
 msgid   "Force using the local unix socket"
 msgstr  ""
 
-#: lxc/image.go:140
-msgid   "Format"
-msgstr  ""
-
-#: lxc/list.go:135
-msgid   "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
 #: lxc/remote.go:80
 msgid   "Generating a client certificate. This may take a minute..."
 msgstr  ""
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid   "IPV4"
 msgstr  ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid   "IPV6"
 msgstr  ""
 
@@ -428,24 +424,24 @@ msgstr  ""
 msgid   "Ignore the container state (only for start)"
 msgstr  ""
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid   "Image already up to date."
 msgstr  ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid   "Image copied successfully!"
 msgstr  ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid   "Image imported with fingerprint: %s"
 msgstr  ""
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid   "Image refreshed successfully!"
 msgstr  ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid   "Importing the image: %s"
 msgstr  ""
@@ -482,11 +478,11 @@ msgstr  ""
 msgid   "Ips:"
 msgstr  ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid   "Keep the image up to date after initial copy"
 msgstr  ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid   "LAST USED AT"
 msgstr  ""
 
@@ -494,12 +490,12 @@ msgstr  ""
 msgid   "LXD socket not found; is LXD installed and running?"
 msgstr  ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid   "Last used: %s"
 msgstr  ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid   "Last used: never"
 msgstr  ""
 
@@ -511,7 +507,7 @@ msgstr  ""
 msgid   "MANAGED"
 msgstr  ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid   "Make image public"
 msgstr  ""
 
@@ -541,7 +537,7 @@ msgstr  ""
 msgid   "Migration failed on target host: %s"
 msgstr  ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid   "Missing summary."
 msgstr  ""
 
@@ -561,7 +557,7 @@ msgstr  ""
 msgid   "Must supply container name for: "
 msgstr  ""
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395 lxc/storage.go:607 lxc/storage.go:696
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395 lxc/storage.go:607 lxc/storage.go:696
 msgid   "NAME"
 msgstr  ""
 
@@ -592,7 +588,7 @@ msgstr  ""
 msgid   "Network usage:"
 msgstr  ""
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid   "New alias to define at target"
 msgstr  ""
 
@@ -620,7 +616,7 @@ msgstr  ""
 msgid   "Only https URLs are supported for simplestreams"
 msgstr  ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid   "Only https:// is supported for remote image import."
 msgstr  ""
 
@@ -632,7 +628,7 @@ msgstr  ""
 msgid   "Options:"
 msgstr  ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid   "Output is in %s"
 msgstr  ""
@@ -641,15 +637,15 @@ msgstr  ""
 msgid   "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr  ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid   "PERSISTENT"
 msgstr  ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid   "PID"
 msgstr  ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid   "PROFILES"
 msgstr  ""
 
@@ -657,7 +653,7 @@ msgstr  ""
 msgid   "PROTOCOL"
 msgstr  ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid   "PUBLIC"
 msgstr  ""
 
@@ -694,7 +690,7 @@ msgstr  ""
 msgid   "Press enter to open the editor again"
 msgstr  ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid   "Press enter to start the editor again"
 msgstr  ""
 
@@ -749,7 +745,7 @@ msgstr  ""
 msgid   "Profiles: %s"
 msgstr  ""
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid   "Properties:"
 msgstr  ""
 
@@ -757,7 +753,7 @@ msgstr  ""
 msgid   "Public image server"
 msgstr  ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid   "Public: %s"
 msgstr  ""
@@ -766,7 +762,7 @@ msgstr  ""
 msgid   "Recursively push or pull files"
 msgstr  ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, c-format
 msgid   "Refreshing the image: %s"
 msgstr  ""
@@ -802,11 +798,11 @@ msgstr  ""
 msgid   "Retrieving image: %s"
 msgstr  ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid   "SIZE"
 msgstr  ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid   "SNAPSHOTS"
 msgstr  ""
 
@@ -814,7 +810,7 @@ msgstr  ""
 msgid   "SOURCE"
 msgstr  ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid   "STATE"
 msgstr  ""
 
@@ -822,7 +818,7 @@ msgstr  ""
 msgid   "STATIC"
 msgstr  ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid   "STORAGE POOL"
 msgstr  ""
 
@@ -866,7 +862,7 @@ msgstr  ""
 msgid   "Show the expanded configuration"
 msgstr  ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid   "Size: %.2fMB"
 msgstr  ""
@@ -880,7 +876,7 @@ msgstr  ""
 msgid   "Some containers failed to %s"
 msgstr  ""
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid   "Source:"
 msgstr  ""
 
@@ -946,7 +942,7 @@ msgstr  ""
 msgid   "Swap (peak)"
 msgstr  ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid   "TYPE"
 msgstr  ""
 
@@ -998,7 +994,7 @@ msgstr  ""
 msgid   "Time to wait for the container before killing it"
 msgstr  ""
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid   "Timestamps:"
 msgstr  ""
 
@@ -1014,7 +1010,7 @@ msgstr  ""
 msgid   "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr  ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid   "Transferring image: %s"
 msgstr  ""
@@ -1032,7 +1028,7 @@ msgstr  ""
 msgid   "Type: persistent"
 msgstr  ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid   "UPLOAD DATE"
 msgstr  ""
 
@@ -1052,7 +1048,7 @@ msgstr  ""
 msgid   "Unable to read remote TLS certificate"
 msgstr  ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid   "Uploaded: %s"
 msgstr  ""
@@ -1199,7 +1195,7 @@ msgid   "Usage: lxc help [--all]\n"
         "Help page for the LXD client."
 msgstr  ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid   "Usage: lxc image <subcommand> [options]\n"
         "\n"
         "Manipulate container images.\n"
@@ -1249,7 +1245,7 @@ msgid   "Usage: lxc image <subcommand> [options]\n"
         "lxc image info [<remote>:]<image>\n"
         "    Print everything LXD knows about a given image.\n"
         "\n"
-        "lxc image list [<remote>:] [filter] [--format table|json]\n"
+        "lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
         "    List images in the LXD image store. Filters may be of the\n"
         "    <key>=<value> form for property based filtering, or part of the image\n"
         "    hash or part of the image alias name.\n"
@@ -1308,8 +1304,8 @@ msgid   "Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-
         "    lxc launch ubuntu:16.04 u1"
 msgstr  ""
 
-#: lxc/list.go:49
-msgid   "Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c <columns>] [--fast]\n"
+#: lxc/list.go:44
+msgid   "Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c <columns>] [--fast]\n"
         "\n"
         "List the existing containers.\n"
         "\n"
@@ -1761,11 +1757,11 @@ msgstr  ""
 msgid   "didn't get any affected image, container or snapshot from server"
 msgstr  ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid   "disabled"
 msgstr  ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid   "enabled"
 msgstr  ""
 
@@ -1783,7 +1779,7 @@ msgstr  ""
 msgid   "got bad version"
 msgstr  ""
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid   "no"
 msgstr  ""
 
@@ -1845,7 +1841,7 @@ msgstr  ""
 msgid   "wrong number of subcommand arguments"
 msgstr  ""
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid   "yes"
 msgstr  ""
 
diff --git a/po/nl.po b/po/nl.po
index 8e1f3b874..440d3dbce 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -68,7 +68,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -132,15 +132,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -153,16 +153,16 @@ msgstr ""
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -187,7 +187,7 @@ msgstr ""
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 msgid "Client certificate stored at server: "
 msgstr ""
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -250,7 +250,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -258,7 +258,7 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -271,7 +271,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -352,16 +352,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -375,11 +375,11 @@ msgstr ""
 msgid "Failed to generate 'lxc.1': %v"
 msgstr ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -400,23 +400,19 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr ""
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr ""
 
@@ -436,24 +432,24 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid "Image refreshed successfully!"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -490,11 +486,11 @@ msgstr ""
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -502,12 +498,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr ""
 
@@ -519,7 +515,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr ""
 
@@ -549,7 +545,7 @@ msgstr ""
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr ""
 
@@ -569,7 +565,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -601,7 +597,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
@@ -629,7 +625,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -641,7 +637,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -650,15 +646,15 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -666,7 +662,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -703,7 +699,7 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -758,7 +754,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr ""
 
@@ -766,7 +762,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -775,7 +771,7 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -811,11 +807,11 @@ msgstr ""
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -823,7 +819,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -831,7 +827,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -875,7 +871,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -889,7 +885,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr ""
 
@@ -955,7 +951,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1011,7 +1007,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr ""
 
@@ -1027,7 +1023,7 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1045,7 +1041,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1065,7 +1061,7 @@ msgstr ""
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1231,7 +1227,7 @@ msgid ""
 "Help page for the LXD client."
 msgstr ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
 "\n"
@@ -1285,7 +1281,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1352,9 +1348,9 @@ msgid ""
 "    lxc launch ubuntu:16.04 u1"
 msgstr ""
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -1850,11 +1846,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr ""
 
@@ -1872,7 +1868,7 @@ msgstr ""
 msgid "got bad version"
 msgstr ""
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -1934,7 +1930,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 3d0cb5d95..4e580670c 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: 2017-02-14 09:54+0000\n"
 "Last-Translator: Vyacheslav Razykov <v.razykov at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -106,7 +106,7 @@ msgstr ""
 "###\n"
 "### Обратите внимание, что имя отображается, но не может быть изменено"
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -203,15 +203,15 @@ msgstr "Нельзя использовать '/' в имени снимка"
 msgid "(none)"
 msgstr "(пусто)"
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr "ПСЕВДОНИМ"
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr "ARCH"
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr "АРХИТЕКТУРА"
 
@@ -224,16 +224,16 @@ msgstr "Принять сертификат"
 msgid "Admin password for %s: "
 msgstr "Пароль администратора для %s: "
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr "Псевдонимы:"
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr "Архитектура: %s"
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr "Авто-обновление: %s"
@@ -259,7 +259,7 @@ msgstr "Использование ЦП (в секундах)"
 msgid "CPU usage:"
 msgstr " Использование ЦП:"
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr "СОЗДАН"
 
@@ -286,7 +286,7 @@ msgstr ""
 msgid "Client certificate stored at server: "
 msgstr "Сертификат клиента хранится на сервере: "
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr "Столбцы"
 
@@ -298,7 +298,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -322,7 +322,7 @@ msgstr "Имя контейнера: %s"
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr "Копировать псевдонимы из источника"
 
@@ -330,7 +330,7 @@ msgstr "Копировать псевдонимы из источника"
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Копирование образа: %s"
@@ -343,7 +343,7 @@ msgstr "Не удалось создать каталог сертификата
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -357,7 +357,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -393,7 +393,7 @@ msgstr ""
 msgid "Disk usage:"
 msgstr " Использование диска:"
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -425,16 +425,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -448,11 +448,11 @@ msgstr ""
 msgid "Failed to generate 'lxc.1': %v"
 msgstr ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -473,23 +473,19 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr ""
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr ""
 
@@ -509,24 +505,24 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid "Image refreshed successfully!"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -563,11 +559,11 @@ msgstr ""
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -575,12 +571,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr ""
 
@@ -592,7 +588,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr ""
 
@@ -623,7 +619,7 @@ msgstr ""
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr ""
 
@@ -643,7 +639,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -676,7 +672,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr " Использование сети:"
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
@@ -704,7 +700,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -716,7 +712,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -725,15 +721,15 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -741,7 +737,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -778,7 +774,7 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -833,7 +829,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr ""
 
@@ -841,7 +837,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -850,7 +846,7 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "Копирование образа: %s"
@@ -886,11 +882,11 @@ msgstr ""
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -898,7 +894,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -906,7 +902,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -950,7 +946,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -964,7 +960,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr ""
 
@@ -1030,7 +1026,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1086,7 +1082,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr ""
 
@@ -1102,7 +1098,7 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1120,7 +1116,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1314,7 +1310,7 @@ msgid ""
 "Help page for the LXD client."
 msgstr ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
 "\n"
@@ -1368,7 +1364,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1435,9 +1431,9 @@ msgid ""
 "    lxc launch ubuntu:16.04 u1"
 msgstr ""
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -1933,11 +1929,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr ""
 
@@ -1955,7 +1951,7 @@ msgstr ""
 msgid "got bad version"
 msgstr ""
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -2017,7 +2013,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 9086a8ee4..5c63321ae 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -68,7 +68,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -132,15 +132,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -153,16 +153,16 @@ msgstr ""
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -187,7 +187,7 @@ msgstr ""
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 msgid "Client certificate stored at server: "
 msgstr ""
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -250,7 +250,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -258,7 +258,7 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -271,7 +271,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -352,16 +352,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -375,11 +375,11 @@ msgstr ""
 msgid "Failed to generate 'lxc.1': %v"
 msgstr ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -400,23 +400,19 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr ""
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr ""
 
@@ -436,24 +432,24 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid "Image refreshed successfully!"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -490,11 +486,11 @@ msgstr ""
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -502,12 +498,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr ""
 
@@ -519,7 +515,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr ""
 
@@ -549,7 +545,7 @@ msgstr ""
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr ""
 
@@ -569,7 +565,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -601,7 +597,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
@@ -629,7 +625,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -641,7 +637,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -650,15 +646,15 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -666,7 +662,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -703,7 +699,7 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -758,7 +754,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr ""
 
@@ -766,7 +762,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -775,7 +771,7 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -811,11 +807,11 @@ msgstr ""
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -823,7 +819,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -831,7 +827,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -875,7 +871,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -889,7 +885,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr ""
 
@@ -955,7 +951,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1011,7 +1007,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr ""
 
@@ -1027,7 +1023,7 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1045,7 +1041,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1065,7 +1061,7 @@ msgstr ""
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1231,7 +1227,7 @@ msgid ""
 "Help page for the LXD client."
 msgstr ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
 "\n"
@@ -1285,7 +1281,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1352,9 +1348,9 @@ msgid ""
 "    lxc launch ubuntu:16.04 u1"
 msgstr ""
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -1850,11 +1846,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr ""
 
@@ -1872,7 +1868,7 @@ msgstr ""
 msgid "got bad version"
 msgstr ""
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -1934,7 +1930,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 23326fb47..82375bf0f 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -68,7 +68,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -132,15 +132,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -153,16 +153,16 @@ msgstr ""
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -187,7 +187,7 @@ msgstr ""
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 msgid "Client certificate stored at server: "
 msgstr ""
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -250,7 +250,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -258,7 +258,7 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -271,7 +271,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -352,16 +352,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -375,11 +375,11 @@ msgstr ""
 msgid "Failed to generate 'lxc.1': %v"
 msgstr ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -400,23 +400,19 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr ""
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr ""
 
@@ -436,24 +432,24 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid "Image refreshed successfully!"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -490,11 +486,11 @@ msgstr ""
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -502,12 +498,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr ""
 
@@ -519,7 +515,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr ""
 
@@ -549,7 +545,7 @@ msgstr ""
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr ""
 
@@ -569,7 +565,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -601,7 +597,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
@@ -629,7 +625,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -641,7 +637,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -650,15 +646,15 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -666,7 +662,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -703,7 +699,7 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -758,7 +754,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr ""
 
@@ -766,7 +762,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -775,7 +771,7 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -811,11 +807,11 @@ msgstr ""
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -823,7 +819,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -831,7 +827,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -875,7 +871,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -889,7 +885,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr ""
 
@@ -955,7 +951,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1011,7 +1007,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr ""
 
@@ -1027,7 +1023,7 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1045,7 +1041,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1065,7 +1061,7 @@ msgstr ""
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1231,7 +1227,7 @@ msgid ""
 "Help page for the LXD client."
 msgstr ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
 "\n"
@@ -1285,7 +1281,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1352,9 +1348,9 @@ msgid ""
 "    lxc launch ubuntu:16.04 u1"
 msgstr ""
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -1850,11 +1846,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr ""
 
@@ -1872,7 +1868,7 @@ msgstr ""
 msgid "got bad version"
 msgstr ""
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -1934,7 +1930,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 4b43d17db..ec73656e6 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: 2017-05-30 14:59-0400\n"
+"POT-Creation-Date: 2017-06-02 16:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -68,7 +68,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:52
+#: lxc/image.go:53
 msgid ""
 "### This is a yaml representation of the image properties.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -132,15 +132,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:650 lxc/image.go:692
+#: lxc/image.go:663 lxc/image.go:715
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:654
+#: lxc/image.go:667
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:448
+#: lxc/list.go:456
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -153,16 +153,16 @@ msgstr ""
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:373
+#: lxc/image.go:374
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:351 lxc/info.go:95
+#: lxc/image.go:352 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:381
+#: lxc/image.go:382
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -187,7 +187,7 @@ msgstr ""
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/list.go:449
+#: lxc/list.go:457
 msgid "CREATED AT"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 msgid "Client certificate stored at server: "
 msgstr ""
 
-#: lxc/list.go:133 lxc/list.go:134
+#: lxc/list.go:128 lxc/list.go:129
 msgid "Columns"
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:746 lxc/network.go:378
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:769 lxc/network.go:378
 #: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:854
 #, c-format
 msgid "Config parsing error: %s"
@@ -250,7 +250,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:137
+#: lxc/image.go:138
 msgid "Copy aliases from source"
 msgstr ""
 
@@ -258,7 +258,7 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:250
+#: lxc/image.go:251
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
@@ -271,7 +271,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:356 lxc/info.go:97
+#: lxc/image.go:357 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:653 lxc/image.go:694 lxc/list.go:450 lxc/network.go:461
+#: lxc/image.go:666 lxc/image.go:717 lxc/list.go:458 lxc/network.go:461
 #: lxc/storage.go:608 lxc/storage.go:697
 msgid "DESCRIPTION"
 msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/list.go:601
+#: lxc/list.go:609
 msgid "EPHEMERAL"
 msgstr ""
 
@@ -352,16 +352,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:360
+#: lxc/image.go:361
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:362
+#: lxc/image.go:363
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:309 lxc/image.go:651 lxc/image.go:693
+#: lxc/config.go:309 lxc/image.go:664 lxc/image.go:716
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -375,11 +375,11 @@ msgstr ""
 msgid "Failed to generate 'lxc.1': %v"
 msgstr ""
 
-#: lxc/list.go:136
+#: lxc/list.go:131
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:350
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -400,23 +400,19 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:140
-msgid "Format"
-msgstr ""
-
-#: lxc/list.go:135
-msgid "Format (table|json|csv)"
+#: lxc/image.go:141 lxc/list.go:130
+msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
 #: lxc/remote.go:80
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/list.go:446
+#: lxc/list.go:454
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:447
+#: lxc/list.go:455
 msgid "IPV6"
 msgstr ""
 
@@ -436,24 +432,24 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:312
+#: lxc/image.go:313
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:253
+#: lxc/image.go:254
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:436 lxc/image.go:448
+#: lxc/image.go:437 lxc/image.go:449
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:311
 msgid "Image refreshed successfully!"
 msgstr ""
 
-#: lxc/image.go:433
+#: lxc/image.go:434
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -490,11 +486,11 @@ msgstr ""
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:138
+#: lxc/image.go:139
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:451
+#: lxc/list.go:459
 msgid "LAST USED AT"
 msgstr ""
 
@@ -502,12 +498,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:365
+#: lxc/image.go:366
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:367
+#: lxc/image.go:368
 msgid "Last used: never"
 msgstr ""
 
@@ -519,7 +515,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:136
+#: lxc/image.go:137
 msgid "Make image public"
 msgstr ""
 
@@ -549,7 +545,7 @@ msgstr ""
 msgid "Migration failed on target host: %s"
 msgstr ""
 
-#: lxc/utils.go:193
+#: lxc/utils.go:201
 msgid "Missing summary."
 msgstr ""
 
@@ -569,7 +565,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:452 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
+#: lxc/list.go:460 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:395
 #: lxc/storage.go:607 lxc/storage.go:696
 msgid "NAME"
 msgstr ""
@@ -601,7 +597,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/image.go:139 lxc/publish.go:35
+#: lxc/image.go:140 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
@@ -629,7 +625,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:439
+#: lxc/image.go:440
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -641,7 +637,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:550
+#: lxc/image.go:551
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -650,15 +646,15 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:603
+#: lxc/list.go:611
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:453
+#: lxc/list.go:461
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:454
+#: lxc/list.go:462
 msgid "PROFILES"
 msgstr ""
 
@@ -666,7 +662,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:652 lxc/remote.go:398
+#: lxc/image.go:665 lxc/remote.go:398
 msgid "PUBLIC"
 msgstr ""
 
@@ -703,7 +699,7 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:747
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:770
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -758,7 +754,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:369
+#: lxc/image.go:370
 msgid "Properties:"
 msgstr ""
 
@@ -766,7 +762,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:352
+#: lxc/image.go:353
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -775,7 +771,7 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:303
+#: lxc/image.go:304
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -811,11 +807,11 @@ msgstr ""
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:655
+#: lxc/image.go:668
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:455
+#: lxc/list.go:463
 msgid "SNAPSHOTS"
 msgstr ""
 
@@ -823,7 +819,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:456
+#: lxc/list.go:464
 msgid "STATE"
 msgstr ""
 
@@ -831,7 +827,7 @@ msgstr ""
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:458
+#: lxc/list.go:466
 msgid "STORAGE POOL"
 msgstr ""
 
@@ -875,7 +871,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:350
+#: lxc/image.go:351
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -889,7 +885,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:383
+#: lxc/image.go:384
 msgid "Source:"
 msgstr ""
 
@@ -955,7 +951,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:457 lxc/network.go:459 lxc/storage.go:695
+#: lxc/list.go:465 lxc/network.go:459 lxc/storage.go:695
 msgid "TYPE"
 msgstr ""
 
@@ -1011,7 +1007,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:353
+#: lxc/image.go:354
 msgid "Timestamps:"
 msgstr ""
 
@@ -1027,7 +1023,7 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:441
+#: lxc/image.go:442
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1045,7 +1041,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:669
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -1065,7 +1061,7 @@ msgstr ""
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:358
+#: lxc/image.go:359
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1231,7 +1227,7 @@ msgid ""
 "Help page for the LXD client."
 msgstr ""
 
-#: lxc/image.go:62
+#: lxc/image.go:63
 msgid ""
 "Usage: lxc image <subcommand> [options]\n"
 "\n"
@@ -1285,7 +1281,7 @@ msgid ""
 "lxc image info [<remote>:]<image>\n"
 "    Print everything LXD knows about a given image.\n"
 "\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format csv|json|table|yaml]\n"
 "    List images in the LXD image store. Filters may be of the\n"
 "    <key>=<value> form for property based filtering, or part of the image\n"
 "    hash or part of the image alias name.\n"
@@ -1352,9 +1348,9 @@ msgid ""
 "    lxc launch ubuntu:16.04 u1"
 msgstr ""
 
-#: lxc/list.go:49
+#: lxc/list.go:44
 msgid ""
-"Usage: lxc list [<remote>:] [filters] [--format table|json|csv] [-c "
+"Usage: lxc list [<remote>:] [filters] [--format csv|json|table|yaml] [-c "
 "<columns>] [--fast]\n"
 "\n"
 "List the existing containers.\n"
@@ -1850,11 +1846,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:344
+#: lxc/image.go:345
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:347
 msgid "enabled"
 msgstr ""
 
@@ -1872,7 +1868,7 @@ msgstr ""
 msgid "got bad version"
 msgstr ""
 
-#: lxc/image.go:339 lxc/image.go:632
+#: lxc/image.go:340 lxc/image.go:632
 msgid "no"
 msgstr ""
 
@@ -1934,7 +1930,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:44 lxc/image.go:341 lxc/image.go:636
+#: lxc/delete.go:44 lxc/image.go:342 lxc/image.go:636
 msgid "yes"
 msgstr ""
 


More information about the lxc-devel mailing list