[lxc-devel] [lxd/master] Add ability to edit clustering roles

stgraber on Github lxc-bot at linuxcontainers.org
Fri Mar 27 02:25:10 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200326/fcde3e3d/attachment-0001.bin>
-------------- next part --------------
From df475aa96175db47049169a62320d6b5fe09d7a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 26 Mar 2020 22:22:48 -0400
Subject: [PATCH 1/8] doc: Fix escaping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/doc/api-extensions.md b/doc/api-extensions.md
index 3340012872..839055f5cb 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -965,7 +965,7 @@ configuration keys: `snapshots.schedule` and
 
 ## trust\_ca\_certificates
 This allows for checking client certificates trusted by the provided CA (`server.ca`).
-It can be enabled by setting `core.trust_ca_certificates` to true.
+It can be enabled by setting `core.trust\_ca\_certificates` to true.
 If enabled, it will perform the check, and bypass the trusted password if true.
 An exception will be made if the connecting client certificate is in the provided CRL (`ca.crl`).
 In this case, it will ask for the password.

From 538b83d4795ae01ad61ccdc06dbe81b766e56112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 10 Nov 2019 15:46:26 -0500
Subject: [PATCH 2/8] lxd/cluster: Tweak errors
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/cluster/membership.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go
index 57d8e910e8..f3e6cba990 100644
--- a/lxd/cluster/membership.go
+++ b/lxd/cluster/membership.go
@@ -620,7 +620,7 @@ func Assign(state *state.State, gateway *Gateway, nodes []db.RaftNode) error {
 		var err error
 		address, err = tx.NodeAddress()
 		if err != nil {
-			return errors.Wrap(err, "failed to fetch the address of this node")
+			return errors.Wrap(err, "Failed to fetch the address of this cluster member")
 		}
 		return nil
 	})
@@ -630,7 +630,7 @@ func Assign(state *state.State, gateway *Gateway, nodes []db.RaftNode) error {
 
 	// Sanity check that we actually have an address.
 	if address == "" {
-		return fmt.Errorf("node is not exposed on the network")
+		return fmt.Errorf("Cluster member is not exposed on the network")
 	}
 
 	// Figure out our node identity.
@@ -644,7 +644,7 @@ func Assign(state *state.State, gateway *Gateway, nodes []db.RaftNode) error {
 	// Sanity check that our address was actually included in the given
 	// list of raft nodes.
 	if info == nil {
-		return fmt.Errorf("this node is not included in the given list of database nodes")
+		return fmt.Errorf("This node is not included in the given list of database nodes")
 	}
 
 	// Replace our local list of raft nodes with the given one (which
@@ -652,7 +652,7 @@ func Assign(state *state.State, gateway *Gateway, nodes []db.RaftNode) error {
 	err = state.Node.Transaction(func(tx *db.NodeTx) error {
 		err = tx.RaftNodesReplace(nodes)
 		if err != nil {
-			return errors.Wrap(err, "failed to set raft nodes")
+			return errors.Wrap(err, "Failed to set raft nodes")
 		}
 
 		return nil
@@ -681,7 +681,7 @@ func Assign(state *state.State, gateway *Gateway, nodes []db.RaftNode) error {
 	// other database code to run while we're reconfiguring raft.
 	err = state.Cluster.EnterExclusive()
 	if err != nil {
-		return errors.Wrap(err, "failed to acquire cluster database lock")
+		return errors.Wrap(err, "Failed to acquire cluster database lock")
 	}
 	transactor = state.Cluster.ExitExclusive
 
@@ -689,7 +689,7 @@ func Assign(state *state.State, gateway *Gateway, nodes []db.RaftNode) error {
 	// somehow leftover).
 	err = os.RemoveAll(state.OS.GlobalDatabaseDir())
 	if err != nil {
-		return errors.Wrap(err, "failed to remove existing raft data")
+		return errors.Wrap(err, "Failed to remove existing raft data")
 	}
 
 	// Re-initialize the gateway. This will create a new raft factory an
@@ -736,7 +736,7 @@ assign:
 		return err
 	})
 	if err != nil {
-		return errors.Wrap(err, "cluster database initialization failed")
+		return errors.Wrap(err, "Cluster database initialization failed")
 	}
 
 	// Generate partial heartbeat request containing just a raft node list.

From d7a392909b31d77e073326baef147c101786b10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 26 Mar 2020 22:22:20 -0400
Subject: [PATCH 3/8] api: clustering_edit_roles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/api-extensions.md | 3 +++
 shared/version/api.go | 1 +
 2 files changed, 4 insertions(+)

diff --git a/doc/api-extensions.md b/doc/api-extensions.md
index 839055f5cb..3fc67bccf3 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -972,3 +972,6 @@ In this case, it will ask for the password.
 
 ## snapshot\_disk\_usage
 This adds a new `size` field to the output of `/1.0/instances/<name>/snapshots/<snapshot>` which represents the disk usage of the snapshot.
+
+## clustering\_edit\_roles
+This adds a writable endpoint for cluster members, allowing the editing of their roles.
diff --git a/shared/version/api.go b/shared/version/api.go
index ba5f2f00ee..cfa20e71f6 100644
--- a/shared/version/api.go
+++ b/shared/version/api.go
@@ -198,6 +198,7 @@ var APIExtensions = []string{
 	"volume_snapshot_scheduling",
 	"trust_ca_certificates",
 	"snapshot_disk_usage",
+	"clustering_edit_roles",
 }
 
 // APIExtensionsCount returns the number of available API extensions.

From 57bc434b4976abdc2217c9832a3dacda5a9ffa9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 10 Nov 2019 17:34:39 -0500
Subject: [PATCH 4/8] shared/api: Add ClusterMemberPut
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/cluster.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/shared/api/cluster.go b/shared/api/cluster.go
index 94ac6a5016..42808d98c6 100644
--- a/shared/api/cluster.go
+++ b/shared/api/cluster.go
@@ -52,12 +52,24 @@ type ClusterMemberPost struct {
 //
 // API extension: clustering
 type ClusterMember struct {
+	ClusterMemberPut `yaml:",inline"`
+
 	ServerName string `json:"server_name" yaml:"server_name"`
 	URL        string `json:"url" yaml:"url"`
 	Database   bool   `json:"database" yaml:"database"`
 	Status     string `json:"status" yaml:"status"`
 	Message    string `json:"message" yaml:"message"`
+}
 
+// Writable converts a full Profile struct into a ProfilePut struct (filters read-only fields)
+func (member *ClusterMember) Writable() ClusterMemberPut {
+	return member.ClusterMemberPut
+}
+
+// ClusterMemberPut represents the the modifiable fields of a LXD cluster member
+//
+// API extension: clustering_edit_roles
+type ClusterMemberPut struct {
 	// API extension: clustering_roles
 	Roles []string `json:"roles" yaml:"roles"`
 

From 61532e1d8da65fa82cfc5cb7e6963482303af6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 10 Nov 2019 18:08:45 -0500
Subject: [PATCH 5/8] lxd/cluster: Make ClusterMember editable
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/api_cluster.go | 71 +++++++++++++++++++++++++++++++++++++++++++++-
 lxd/db/node.go     | 42 ++++++++++++++++++++++++++-
 2 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index 15b67a585a..f9db3dc5da 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -47,6 +47,8 @@ var clusterNodeCmd = APIEndpoint{
 
 	Delete: APIEndpointAction{Handler: clusterNodeDelete},
 	Get:    APIEndpointAction{Handler: clusterNodeGet, AccessHandler: allowAuthenticated},
+	Patch:  APIEndpointAction{Handler: clusterNodePatch},
+	Put:    APIEndpointAction{Handler: clusterNodePut},
 	Post:   APIEndpointAction{Handler: clusterNodePost},
 }
 
@@ -880,13 +882,80 @@ func clusterNodeGet(d *Daemon, r *http.Request) response.Response {
 
 	for _, node := range nodes {
 		if node.ServerName == name {
-			return response.SyncResponseETag(true, node, node)
+			return response.SyncResponseETag(true, node, node.Roles)
 		}
 	}
 
 	return response.NotFound(fmt.Errorf("Member '%s' not found", name))
 }
 
+func clusterNodePatch(d *Daemon, r *http.Request) response.Response {
+	// Right now, Patch does the same as Put.
+	return clusterNodePut(d, r)
+}
+
+func clusterNodePut(d *Daemon, r *http.Request) response.Response {
+	name := mux.Vars(r)["name"]
+
+	// Find the requested one.
+	var current db.NodeInfo
+	var err error
+	err = d.cluster.Transaction(func(tx *db.ClusterTx) error {
+		current, err = tx.NodeByName(name)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+	if err != nil {
+		return response.SmartError(err)
+	}
+
+	// Validate the request is fine
+	err = util.EtagCheck(r, current.Roles)
+	if err != nil {
+		return response.PreconditionFailed(err)
+	}
+
+	// Parse the request
+	req := api.ClusterMemberPut{}
+
+	err = json.NewDecoder(r.Body).Decode(&req)
+	if err != nil {
+		return response.BadRequest(err)
+	}
+
+	// Validate the request
+	if shared.StringInSlice(string(db.ClusterRoleDatabase), current.Roles) && !shared.StringInSlice(string(db.ClusterRoleDatabase), req.Roles) {
+		return response.BadRequest(fmt.Errorf("The '%s' role cannot be dropped at this time", db.ClusterRoleDatabase))
+	}
+
+	if !shared.StringInSlice(string(db.ClusterRoleDatabase), current.Roles) && shared.StringInSlice(string(db.ClusterRoleDatabase), req.Roles) {
+		return response.BadRequest(fmt.Errorf("The '%s' role cannot be added at this time", db.ClusterRoleDatabase))
+	}
+
+	// Update the database
+	err = d.cluster.Transaction(func(tx *db.ClusterTx) error {
+		dbRoles := []db.ClusterRole{}
+		for _, role := range req.Roles {
+			dbRoles = append(dbRoles, db.ClusterRole(role))
+		}
+
+		err := tx.NodeUpdateRoles(current.ID, dbRoles)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+	if err != nil {
+		return response.SmartError(err)
+	}
+
+	return response.EmptySyncResponse
+}
+
 func clusterNodePost(d *Daemon, r *http.Request) response.Response {
 	name := mux.Vars(r)["name"]
 
diff --git a/lxd/db/node.go b/lxd/db/node.go
index bf743d0828..049d7dd198 100644
--- a/lxd/db/node.go
+++ b/lxd/db/node.go
@@ -8,13 +8,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/lxc/lxd/lxd/db/cluster"
 	"github.com/lxc/lxd/lxd/db/query"
 	"github.com/lxc/lxd/lxd/util"
 	"github.com/lxc/lxd/shared"
 	"github.com/lxc/lxd/shared/osarch"
 	"github.com/lxc/lxd/shared/version"
-	"github.com/pkg/errors"
 )
 
 // ClusterRole represents the role of a member in a cluster.
@@ -414,6 +415,45 @@ func (c *ClusterTx) NodeRemoveRole(id int64, role ClusterRole) error {
 	return nil
 }
 
+// NodeUpdateRoles changes the list of roles on a member.
+func (c *ClusterTx) NodeUpdateRoles(id int64, roles []ClusterRole) error {
+	getRoleID := func(role ClusterRole) (int, error) {
+		for k, v := range ClusterRoles {
+			if v == role {
+				return k, nil
+			}
+		}
+
+		return -1, fmt.Errorf("Invalid cluster role '%s'", role)
+	}
+
+	// Translate role names to ids
+	roleIDs := []int{}
+	for _, role := range roles {
+		roleID, err := getRoleID(role)
+		if err != nil {
+			return err
+		}
+
+		roleIDs = append(roleIDs, roleID)
+	}
+
+	// Update the database record
+	_, err := c.tx.Exec("DELETE FROM nodes_roles WHERE node_id=?", id)
+	if err != nil {
+		return err
+	}
+
+	for _, roleID := range roleIDs {
+		_, err := c.tx.Exec("INSERT INTO nodes_roles (node_id, role) VALUES (?, ?)", id, roleID)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // NodeRemove removes the node with the given id.
 func (c *ClusterTx) NodeRemove(id int64) error {
 	result, err := c.tx.Exec("DELETE FROM nodes WHERE id=?", id)

From a1c56bcc86ba737fd6f806115661242c8c04d69b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 10 Nov 2019 18:27:57 -0500
Subject: [PATCH 6/8] client: Add UpdateClusterMember
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 client/interfaces.go  |  1 +
 client/lxd_cluster.go | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/client/interfaces.go b/client/interfaces.go
index 8f0ce20bee..ec5c3de008 100644
--- a/client/interfaces.go
+++ b/client/interfaces.go
@@ -285,6 +285,7 @@ type InstanceServer interface {
 	GetClusterMemberNames() (names []string, err error)
 	GetClusterMembers() (members []api.ClusterMember, err error)
 	GetClusterMember(name string) (member *api.ClusterMember, ETag string, err error)
+	UpdateClusterMember(name string, member api.ClusterMemberPut, ETag string) (err error)
 	RenameClusterMember(name string, member api.ClusterMemberPost) (err error)
 
 	// Internal functions (for internal use)
diff --git a/client/lxd_cluster.go b/client/lxd_cluster.go
index 824d94a7f0..c0f9181dc5 100644
--- a/client/lxd_cluster.go
+++ b/client/lxd_cluster.go
@@ -108,6 +108,21 @@ func (r *ProtocolLXD) GetClusterMember(name string) (*api.ClusterMember, string,
 	return &member, etag, nil
 }
 
+// UpdateClusterMember returns information about the given member
+func (r *ProtocolLXD) UpdateClusterMember(name string, member api.ClusterMemberPut, ETag string) error {
+	if !r.HasExtension("clustering_edit_roles") {
+		return fmt.Errorf("The server is missing the required \"clustering_edit_roles\" API extension")
+	}
+
+	// Send the request
+	_, _, err := r.query("PUT", fmt.Sprintf("/cluster/members/%s", name), member, ETag)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // RenameClusterMember changes the name of an existing member
 func (r *ProtocolLXD) RenameClusterMember(name string, member api.ClusterMemberPost) error {
 	if !r.HasExtension("clustering") {

From 2b9e8f56972da9b51e7b1e92cdeb52ec162b94af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 10 Nov 2019 18:28:09 -0500
Subject: [PATCH 7/8] lxc/cluster: Add edit sub-command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/cluster.go b/lxc/cluster.go
index e2ff150599..eacd4ae36f 100644
--- a/lxc/cluster.go
+++ b/lxc/cluster.go
@@ -3,6 +3,7 @@ package main
 import (
 	"bufio"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"sort"
 	"strings"
@@ -16,6 +17,7 @@ import (
 	"github.com/lxc/lxd/shared/api"
 	cli "github.com/lxc/lxd/shared/cmd"
 	"github.com/lxc/lxd/shared/i18n"
+	"github.com/lxc/lxd/shared/termios"
 )
 
 type cmdCluster struct {
@@ -49,6 +51,10 @@ func (c *cmdCluster) Command() *cobra.Command {
 	clusterEnableCmd := cmdClusterEnable{global: c.global, cluster: c}
 	cmd.AddCommand(clusterEnableCmd.Command())
 
+	// Edit
+	clusterEditCmd := cmdClusterEdit{global: c.global, cluster: c}
+	cmd.AddCommand(clusterEditCmd.Command())
+
 	return cmd
 }
 
@@ -401,3 +407,114 @@ func (c *cmdClusterEnable) Run(cmd *cobra.Command, args []string) error {
 	fmt.Println(i18n.G("Clustering enabled"))
 	return nil
 }
+
+// Edit
+type cmdClusterEdit struct {
+	global  *cmdGlobal
+	cluster *cmdCluster
+}
+
+func (c *cmdClusterEdit) Command() *cobra.Command {
+	cmd := &cobra.Command{}
+	cmd.Use = i18n.G("edit [<remote>:]<cluster member>")
+	cmd.Short = i18n.G("Edit cluster member configurations as YAML")
+	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
+		`Edit cluster member configurations as YAML`))
+	cmd.Example = cli.FormatSection("", i18n.G(
+		`lxc cluster edit <cluster member> < member.yaml
+    Update a cluster member using the content of member.yaml`))
+
+	cmd.RunE = c.Run
+
+	return cmd
+}
+
+func (c *cmdClusterEdit) helpTemplate() string {
+	return i18n.G(
+		`### This is a yaml representation of the cluster member.
+### Any line starting with a '# will be ignored.`)
+}
+
+func (c *cmdClusterEdit) Run(cmd *cobra.Command, args []string) error {
+	// Sanity checks
+	exit, err := c.global.CheckArgs(cmd, args, 1, 1)
+	if exit {
+		return err
+	}
+
+	// Parse remote
+	resources, err := c.global.ParseServers(args[0])
+	if err != nil {
+		return err
+	}
+
+	resource := resources[0]
+
+	if resource.name == "" {
+		return fmt.Errorf(i18n.G("Missing cluster member name"))
+	}
+
+	// If stdin isn't a terminal, read text from it
+	if !termios.IsTerminal(getStdinFd()) {
+		contents, err := ioutil.ReadAll(os.Stdin)
+		if err != nil {
+			return err
+		}
+
+		newdata := api.ClusterMemberPut{}
+		err = yaml.Unmarshal(contents, &newdata)
+		if err != nil {
+			return err
+		}
+
+		return resource.server.UpdateClusterMember(resource.name, newdata, "")
+	}
+
+	// Extract the current value
+	member, etag, err := resource.server.GetClusterMember(resource.name)
+	if err != nil {
+		return err
+	}
+
+	memberWritable := member.Writable()
+
+	data, err := yaml.Marshal(&memberWritable)
+	if err != nil {
+		return err
+	}
+
+	// Spawn the editor
+	content, err := shared.TextEditor("", []byte(c.helpTemplate()+"\n\n"+string(data)))
+	if err != nil {
+		return err
+	}
+
+	for {
+		// Parse the text received from the editor
+		newdata := api.ClusterMemberPut{}
+		err = yaml.Unmarshal(content, &newdata)
+		if err == nil {
+			err = resource.server.UpdateClusterMember(resource.name, newdata, etag)
+		}
+
+		// Respawn the editor
+		if err != nil {
+			fmt.Fprintf(os.Stderr, i18n.G("Config parsing error: %s")+"\n", err)
+			fmt.Println(i18n.G("Press enter to open the editor again"))
+
+			_, err := os.Stdin.Read(make([]byte, 1))
+			if err != nil {
+				return err
+			}
+
+			content, err = shared.TextEditor("", content)
+			if err != nil {
+				return err
+			}
+			continue
+		}
+		break
+	}
+
+	return nil
+}

From f0f120f197867078ecd618d576d65af22b445fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 10 Nov 2019 18:28:21 -0500
Subject: [PATCH 8/8] i18n: Update translation templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 po/bg.po      | 292 +++++++++++++++++++++++++----------------------
 po/de.po      | 303 +++++++++++++++++++++++++++----------------------
 po/el.po      | 292 +++++++++++++++++++++++++----------------------
 po/es.po      | 294 ++++++++++++++++++++++++++----------------------
 po/fa.po      | 292 +++++++++++++++++++++++++----------------------
 po/fi.po      | 292 +++++++++++++++++++++++++----------------------
 po/fr.po      | 306 ++++++++++++++++++++++++++++----------------------
 po/hi.po      | 292 +++++++++++++++++++++++++----------------------
 po/id.po      | 292 +++++++++++++++++++++++++----------------------
 po/it.po      | 294 ++++++++++++++++++++++++++----------------------
 po/ja.po      | 298 ++++++++++++++++++++++++++----------------------
 po/ko.po      | 292 +++++++++++++++++++++++++----------------------
 po/lxd.pot    | 188 +++++++++++++++++--------------
 po/nb_NO.po   | 292 +++++++++++++++++++++++++----------------------
 po/nl.po      | 292 +++++++++++++++++++++++++----------------------
 po/pa.po      | 292 +++++++++++++++++++++++++----------------------
 po/pl.po      | 292 +++++++++++++++++++++++++----------------------
 po/pt_BR.po   | 294 ++++++++++++++++++++++++++----------------------
 po/ru.po      | 297 ++++++++++++++++++++++++++----------------------
 po/sl.po      | 292 +++++++++++++++++++++++++----------------------
 po/sr.po      | 292 +++++++++++++++++++++++++----------------------
 po/sv.po      | 292 +++++++++++++++++++++++++----------------------
 po/te.po      | 292 +++++++++++++++++++++++++----------------------
 po/tr.po      | 292 +++++++++++++++++++++++++----------------------
 po/uk.po      | 292 +++++++++++++++++++++++++----------------------
 po/zh_Hans.po | 292 +++++++++++++++++++++++++----------------------
 26 files changed, 4114 insertions(+), 3416 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 591acc84fa..d96c5a0f69 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index cd45ed1599..ddbd760675 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2019-12-12 14:53+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -290,6 +290,12 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -338,11 +344,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 #, fuzzy
 msgid "--refresh can only be used with instances"
 msgstr "--refresh kann nur mit Containern verwendet werden"
@@ -361,7 +367,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITEKTUR"
 
@@ -515,7 +521,7 @@ msgstr "automatisches Update: %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 #, fuzzy
 msgid "Backup exported successfully!"
 msgstr "Profil %s erstellt\n"
@@ -525,7 +531,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -536,7 +542,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr "Ungültige Abbild Eigenschaft: %s\n"
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -617,7 +623,7 @@ msgstr ""
 "Optionen:\n"
 "\n"
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -693,8 +699,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -706,7 +712,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -726,7 +732,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 #, fuzzy
 msgid "Config key/value to apply to the new instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -736,14 +742,15 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Config key/value to apply to the new project"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 #, fuzzy
 msgid "Config key/value to apply to the target instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, fuzzy, c-format
 msgid "Config parsing error: %s"
 msgstr "YAML Analyse Fehler %v\n"
@@ -757,7 +764,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -777,7 +784,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 #, fuzzy
 msgid "Copy instances within or in between LXD servers"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -795,7 +802,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 #, fuzzy
 msgid "Copy the instance without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -805,7 +812,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Copy the volume without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -907,7 +914,7 @@ msgstr "Fehlerhafte Profil URL %s"
 msgid "Create storage pools"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 #, fuzzy
 msgid "Create the instance with no profiles applied"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -932,7 +939,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -949,7 +956,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1008,53 +1015,54 @@ msgstr "Kein Zertifikat für diese Verbindung"
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1147,7 +1155,7 @@ msgstr " Prozessorauslastung:"
 msgid "Disks:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1174,6 +1182,11 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+#, fuzzy
+msgid "Edit cluster member configurations as YAML"
+msgstr "Alternatives config Verzeichnis."
+
 #: lxc/file.go:153 lxc/file.go:154
 #, fuzzy
 msgid "Edit files in instances"
@@ -1223,11 +1236,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1246,7 +1259,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 #, fuzzy
 msgid "Ephemeral instance"
 msgstr "Flüchtiger Container"
@@ -1303,17 +1316,17 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 #, fuzzy
 msgid "Export instance backups"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 #, fuzzy
 msgid "Export instances as backup tarballs."
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -1332,7 +1345,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr "FINGERABDRUCK"
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 #, fuzzy
 msgid "Failed to connect to cluster member"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -1342,7 +1355,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 #, fuzzy
 msgid "Failed to get the new instance name"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -1377,7 +1390,7 @@ msgstr "Fingerabdruck: %s\n"
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1394,7 +1407,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1418,7 +1431,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1625,7 +1638,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1735,7 +1748,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1767,7 +1780,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Aliasse:\n"
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1978,7 +1991,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -2000,7 +2013,7 @@ msgstr "Veröffentliche Abbild"
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -2104,12 +2117,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "Gerät %s wurde von %s entfernt\n"
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
@@ -2130,11 +2143,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2142,6 +2155,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "der Name des Ursprung Containers muss angegeben werden"
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2233,7 +2251,7 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 "Mehr als eine Datei herunterzuladen, aber das Ziel ist kein Verzeichnis"
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 #, fuzzy
 msgid "Move instances within or in between LXD servers"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -2243,7 +2261,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Move storage volumes between pools"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 #, fuzzy
 msgid "Move the instance without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -2262,7 +2280,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2346,7 +2364,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 #, fuzzy
 msgid "New key/value to apply to a specific device"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -2459,7 +2477,7 @@ msgstr "Administrator Passwort für %s: "
 msgid "Pause instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2477,8 +2495,8 @@ msgstr "Erstellt: %s"
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2548,12 +2566,12 @@ msgstr "Gerät %s wurde von %s entfernt\n"
 msgid "Profile %s renamed to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 #, fuzzy
 msgid "Profile to apply to the new instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 #, fuzzy
 msgid "Profile to apply to the target instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -2654,7 +2672,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -2713,7 +2731,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2740,7 +2758,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2859,7 +2877,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -3040,7 +3058,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3226,7 +3244,7 @@ msgstr "Profil %s gelöscht\n"
 msgid "Storage pool %s pending on member %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 #, fuzzy
 msgid "Storage pool name"
 msgstr "Profilname kann nicht geändert werden"
@@ -3291,15 +3309,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3343,7 +3361,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3405,7 +3423,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3423,11 +3441,11 @@ msgstr "unbekannter entfernter Instanz Name: %q"
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3436,7 +3454,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -3460,7 +3478,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3489,7 +3507,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr "Unbekannter Befehl %s für Abbild"
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 #, fuzzy
 msgid "Unset all profiles on the target instance"
 msgstr "nicht alle Profile der Quelle sind am Ziel vorhanden."
@@ -3536,7 +3554,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3550,7 +3568,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3592,7 +3610,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 #, fuzzy
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "Zustand des laufenden Containers sichern oder nicht"
@@ -3625,12 +3643,12 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 #, fuzzy
 msgid "You must specify a destination instance name when using --target"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 #, fuzzy
 msgid "You must specify a source instance name"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
@@ -3697,7 +3715,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3725,7 +3743,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3884,6 +3902,15 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3949,7 +3976,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3975,7 +4002,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 #, fuzzy
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
@@ -4092,7 +4119,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -4147,6 +4174,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -4172,7 +4205,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -4257,7 +4290,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 #, fuzzy
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
@@ -4372,7 +4405,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 #, fuzzy
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
@@ -4508,7 +4541,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4533,7 +4566,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4673,7 +4706,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4854,7 +4887,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
@@ -4875,10 +4908,6 @@ msgstr ""
 #~ "(deprecated, use instance-only)"
 #~ msgstr "Zustand des laufenden Containers sichern oder nicht"
 
-#, fuzzy
-#~ msgid "Missing container.name name"
-#~ msgstr "der Name des Ursprung Containers muss angegeben werden"
-
 #, fuzzy
 #~ msgid "Enable debug mode"
 #~ msgstr "Aktiviert Debug Modus"
diff --git a/po/el.po b/po/el.po
index 77831fca6d..e831ad5400 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-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/"
@@ -163,6 +163,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -211,11 +217,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -232,7 +238,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -377,7 +383,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -386,7 +392,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -397,7 +403,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -468,7 +474,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -539,8 +545,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -552,7 +558,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -572,7 +578,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -580,13 +586,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -600,7 +607,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -620,7 +627,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -636,7 +643,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -644,7 +651,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +742,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -758,7 +765,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -775,7 +782,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -829,53 +836,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -960,7 +968,7 @@ msgstr "  Χρήση CPU:"
 msgid "Disks:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -987,6 +995,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1032,11 +1044,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1055,7 +1067,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1107,15 +1119,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1134,7 +1146,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1143,7 +1155,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1174,7 +1186,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1190,7 +1202,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1214,7 +1226,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1415,7 +1427,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1519,7 +1531,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1550,7 +1562,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1738,7 +1750,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1759,7 +1771,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1851,12 +1863,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1879,11 +1891,11 @@ msgstr "  Χρήση μνήμης:"
 msgid "Memory:"
 msgstr "  Χρήση μνήμης:"
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1891,6 +1903,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1976,7 +1992,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1984,7 +2000,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -2001,7 +2017,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2085,7 +2101,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2194,7 +2210,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2212,8 +2228,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2283,11 +2299,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2381,7 +2397,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2439,7 +2455,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2463,7 +2479,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2573,7 +2589,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2746,7 +2762,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2921,7 +2937,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2982,15 +2998,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3031,7 +3047,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3089,7 +3105,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3107,11 +3123,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3120,7 +3136,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3144,7 +3160,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3173,7 +3189,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3215,7 +3231,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3229,7 +3245,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3267,7 +3283,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3294,11 +3310,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3350,7 +3366,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3374,7 +3390,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3492,6 +3508,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3532,7 +3552,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3558,7 +3578,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3645,7 +3665,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3692,6 +3712,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3717,7 +3743,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3802,7 +3828,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3913,7 +3939,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -4007,7 +4033,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4027,7 +4053,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4109,7 +4135,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4246,7 +4272,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 627680641a..78e1dae889 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -284,6 +284,12 @@ msgstr ""
 "###   source: /home/chb/mnt/lxd_test/default.img\n"
 "###   zfs.pool_name: default"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -332,12 +338,12 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 #, fuzzy
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr "--container-only no se puede pasar cuando la fuente es una instantánea"
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -354,7 +360,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARQUITECTURA"
 
@@ -500,7 +506,7 @@ msgstr "Auto actualización: %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -509,7 +515,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +526,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr "Propiedad mala: %s"
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -592,7 +598,7 @@ msgstr "Cacheado: %s"
 msgid "Caches:"
 msgstr "Cacheado: %s"
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -665,8 +671,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -678,7 +684,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr "Nombre del Miembro del Cluster"
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -698,7 +704,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 #, fuzzy
 msgid "Config key/value to apply to the new instance"
 msgstr "Perfil para aplicar al nuevo contenedor"
@@ -707,14 +713,15 @@ msgstr "Perfil para aplicar al nuevo contenedor"
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 #, fuzzy
 msgid "Config key/value to apply to the target instance"
 msgstr "Perfil para aplicar al nuevo contenedor"
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -728,7 +735,7 @@ msgstr "Log de la consola:"
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -748,7 +755,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -764,7 +771,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -772,7 +779,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -868,7 +875,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -892,7 +899,7 @@ msgstr "Creando el contenedor"
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -909,7 +916,7 @@ msgstr "CONTROLADOR"
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -964,53 +971,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1094,7 +1102,7 @@ msgstr "Uso del disco:"
 msgid "Disks:"
 msgstr "Uso del disco:"
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1121,6 +1129,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1166,11 +1178,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1189,7 +1201,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1241,17 +1253,17 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 #, fuzzy
 msgid "Export instance backups"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 #, fuzzy
 msgid "Export instances as backup tarballs."
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -1270,7 +1282,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr "HUELLA DIGITAL"
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1279,7 +1291,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 #, fuzzy
 msgid "Failed to get the new instance name"
 msgstr "Perfil para aplicar al nuevo contenedor"
@@ -1311,7 +1323,7 @@ msgstr "Huella dactilar: %s"
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1327,7 +1339,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1351,7 +1363,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1554,7 +1566,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr "Nombre del contenedor es obligatorio"
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Nombre del contenedor es: %s"
@@ -1658,7 +1670,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1690,7 +1702,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Aliases:"
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1879,7 +1891,7 @@ msgstr "Cacheado: %s"
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1900,7 +1912,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1992,12 +2004,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2018,11 +2030,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2030,6 +2042,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Nombre del Miembro del Cluster"
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2118,7 +2135,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -2126,7 +2143,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -2143,7 +2160,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2226,7 +2243,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2335,7 +2352,7 @@ msgstr "Contraseña admin para %s:"
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2353,8 +2370,8 @@ msgstr "Auto actualización: %s"
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2424,12 +2441,12 @@ msgstr "Perfil %s eliminado de %s"
 msgid "Profile %s renamed to %s"
 msgstr "Perfil %s renombrado a %s"
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 #, fuzzy
 msgid "Profile to apply to the new instance"
 msgstr "Perfil para aplicar al nuevo contenedor"
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 #, fuzzy
 msgid "Profile to apply to the target instance"
 msgstr "Perfil para aplicar al nuevo contenedor"
@@ -2525,7 +2542,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -2583,7 +2600,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2607,7 +2624,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2719,7 +2736,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2892,7 +2909,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3067,7 +3084,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -3128,15 +3145,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3177,7 +3194,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3235,7 +3252,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3253,11 +3270,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3266,7 +3283,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -3290,7 +3307,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3319,7 +3336,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3361,7 +3378,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3375,7 +3392,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3413,7 +3430,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3440,11 +3457,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3499,7 +3516,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3523,7 +3540,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3644,6 +3661,11 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3688,7 +3710,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3714,7 +3736,7 @@ msgstr "Expira: %s"
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3804,7 +3826,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3853,6 +3875,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3878,7 +3906,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3963,7 +3991,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -4074,7 +4102,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 #, fuzzy
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
@@ -4173,7 +4201,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4194,7 +4222,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4283,7 +4311,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "show [<remote>:]<instance|profile>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4428,7 +4456,7 @@ msgstr "Columnas"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 123d24df1e..73ad8683e8 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index e90d5472a4..afeb51839f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 77e7d3d697..e685ba746a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2019-01-04 18:07+0000\n"
 "Last-Translator: Deleted User <noreply+12102 at weblate.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -284,6 +284,12 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -332,11 +338,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -354,7 +360,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIAS"
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTURE"
 
@@ -506,7 +512,7 @@ msgstr "Mise à jour auto. : %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 #, fuzzy
 msgid "Backup exported successfully!"
 msgstr "Image copiée avec succès !"
@@ -516,7 +522,7 @@ msgstr "Image copiée avec succès !"
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -527,7 +533,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr "Mauvaise propriété : %s"
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -599,7 +605,7 @@ msgstr "Créé : %s"
 msgid "Caches:"
 msgstr "Créé : %s"
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -675,8 +681,8 @@ msgid "Client version: %s\n"
 msgstr "Afficher la version du client"
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -688,7 +694,7 @@ msgstr "Afficher la version du client"
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -714,7 +720,7 @@ msgstr ""
 "commandes ci-dessous.\n"
 "Pour de l'aide avec l'une des commandes, simplement les utiliser avec --help."
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 #, fuzzy
 msgid "Config key/value to apply to the new instance"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
@@ -724,14 +730,15 @@ msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 msgid "Config key/value to apply to the new project"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 #, fuzzy
 msgid "Config key/value to apply to the target instance"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "Erreur lors de la lecture de la configuration : %s"
@@ -745,7 +752,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -765,7 +772,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 #, fuzzy
 msgid "Copy instances within or in between LXD servers"
 msgstr "Copiez le conteneur sans ses instantanés"
@@ -783,7 +790,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr "Copie de l'image : %s"
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 #, fuzzy
 msgid "Copy the instance without its snapshots"
 msgstr "Copiez le conteneur sans ses instantanés"
@@ -793,7 +800,7 @@ msgstr "Copiez le conteneur sans ses instantanés"
 msgid "Copy the volume without its snapshots"
 msgstr "Copiez le conteneur sans ses instantanés"
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -912,7 +919,7 @@ msgstr "Créé : %s"
 msgid "Create storage pools"
 msgstr "Copie de l'image : %s"
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 #, fuzzy
 msgid "Create the instance with no profiles applied"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -937,7 +944,7 @@ msgstr "Création du conteneur"
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -954,7 +961,7 @@ msgstr "PILOTE"
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 #, fuzzy
 msgid "Define a compression algorithm: for backup or none"
 msgstr "Définir un algorithme de compression : pour image ou aucun"
@@ -1015,53 +1022,54 @@ msgstr "Copie de l'image : %s"
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1148,7 +1156,7 @@ msgstr "  Disque utilisé :"
 msgid "Disks:"
 msgstr "  Disque utilisé :"
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 #, fuzzy
 msgid "Don't require user confirmation for using --force"
 msgstr "Requérir une confirmation de l'utilisateur"
@@ -1176,6 +1184,11 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+#, fuzzy
+msgid "Edit cluster member configurations as YAML"
+msgstr "Clé de configuration invalide"
+
 #: lxc/file.go:153 lxc/file.go:154
 #, fuzzy
 msgid "Edit files in instances"
@@ -1226,11 +1239,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1249,7 +1262,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "Variable d'environnement (de la forme HOME=/home/foo) à positionner"
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 #, fuzzy
 msgid "Ephemeral instance"
 msgstr "Conteneur éphémère"
@@ -1312,17 +1325,17 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 #, fuzzy
 msgid "Export instance backups"
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 #, fuzzy
 msgid "Export instances as backup tarballs."
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "Import de l'image : %s"
@@ -1342,7 +1355,7 @@ msgstr "NOM"
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 #, fuzzy
 msgid "Failed to connect to cluster member"
 msgstr "Profil à appliquer au nouveau conteneur"
@@ -1352,7 +1365,7 @@ msgstr "Profil à appliquer au nouveau conteneur"
 msgid "Failed to create alias %s"
 msgstr "Échec lors de la génération de 'lxc.%s.1': %v"
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 #, fuzzy
 msgid "Failed to get the new instance name"
 msgstr "Profil à appliquer au nouveau conteneur"
@@ -1385,7 +1398,7 @@ msgstr "Empreinte : %s"
 msgid "Force pseudo-terminal allocation"
 msgstr "Forcer l'allocation d'un pseudo-terminal"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1403,7 +1416,7 @@ 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/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1427,7 +1440,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1644,7 +1657,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr "Le nom du conteneur est obligatoire"
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Le nom du conteneur est : %s"
@@ -1749,7 +1762,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1781,7 +1794,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Alias :"
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -2033,7 +2046,7 @@ msgstr "Créé : %s"
 msgid "MANAGED"
 msgstr "GÉRÉ"
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -2054,7 +2067,7 @@ msgstr "Rendre l'image publique"
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -2156,12 +2169,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "Profil %s supprimé de %s"
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
@@ -2184,12 +2197,12 @@ msgstr "  Mémoire utilisée :"
 msgid "Memory:"
 msgstr "  Mémoire utilisée :"
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 #, fuzzy
 msgid "Migration API failure"
 msgstr "Échec lors de la migration vers l'hôte source: %s"
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2197,6 +2210,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Vous devez fournir le nom d'un conteneur pour : "
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2291,7 +2309,7 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 "Plusieurs fichiers à télécharger, mais la destination n'est pas un dossier"
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 #, fuzzy
 msgid "Move instances within or in between LXD servers"
 msgstr "Forcer le conteneur à s'arrêter"
@@ -2301,7 +2319,7 @@ msgstr "Forcer le conteneur à s'arrêter"
 msgid "Move storage volumes between pools"
 msgstr "Copie de l'image : %s"
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 #, fuzzy
 msgid "Move the instance without its snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
@@ -2320,7 +2338,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2405,7 +2423,7 @@ msgstr "Nouvel alias à définir sur la cible"
 msgid "New aliases to add to the image"
 msgstr "Nouvel alias à définir sur la cible"
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 #, fuzzy
 msgid "New key/value to apply to a specific device"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
@@ -2525,7 +2543,7 @@ msgstr "Mot de passe administrateur pour %s : "
 msgid "Pause instances"
 msgstr "Création du conteneur"
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2543,8 +2561,8 @@ msgstr "État : %s"
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
 
@@ -2614,12 +2632,12 @@ msgstr "Profil %s supprimé de %s"
 msgid "Profile %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 #, fuzzy
 msgid "Profile to apply to the new instance"
 msgstr "Profil à appliquer au nouveau conteneur"
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 #, fuzzy
 msgid "Profile to apply to the target instance"
 msgstr "Profil à appliquer au nouveau conteneur"
@@ -2721,7 +2739,7 @@ msgstr "Pousser ou récupérer des fichiers récursivement"
 msgid "Refresh images"
 msgstr "Récupération de l'image : %s"
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
@@ -2780,7 +2798,7 @@ msgstr "Serveur distant : %s"
 msgid "Remove %s (yes/no): "
 msgstr "Supprimer %s (oui/non) : "
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2807,7 +2825,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2926,7 +2944,7 @@ msgstr "SOURCE"
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr "ÉTAT"
 
@@ -3111,7 +3129,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3303,7 +3321,7 @@ msgstr "Le réseau %s a été supprimé"
 msgid "Storage pool %s pending on member %s"
 msgstr "Le réseau %s a été créé"
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr "Nom de l'ensemble de stockage"
 
@@ -3369,15 +3387,15 @@ msgstr ""
 msgid "TYPE"
 msgstr "TYPE"
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3427,7 +3445,7 @@ msgstr "L'image locale '%s' n'a pas été trouvée, essayer '%s:' à la place."
 msgid "The profile device doesn't exist"
 msgstr "Le périphérique indiqué n'existe pas"
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3489,7 +3507,7 @@ msgstr ""
 "Pour démarrer votre premier conteneur, essayer : lxc launch ubuntu:16.04"
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3507,11 +3525,11 @@ msgstr "Transfert de l'image : %s"
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3520,7 +3538,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr "Transfert de l'image : %s"
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "Transfert de l'image : %s"
@@ -3544,7 +3562,7 @@ msgstr "Type : éphémère"
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr "URL"
 
@@ -3573,7 +3591,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 #, fuzzy
 msgid "Unset all profiles on the target instance"
 msgstr "tous les profils de la source n'existent pas sur la cible"
@@ -3623,7 +3641,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr "Publié : %s"
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3637,7 +3655,7 @@ msgstr "Publié : %s"
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 #, fuzzy
 msgid "User aborted delete operation"
 msgstr "L'utilisateur a annulé l'opération de suppression."
@@ -3676,7 +3694,7 @@ msgstr "Nom : %s"
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 #, fuzzy
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
@@ -3709,12 +3727,12 @@ msgstr "Il est impossible de passer -t et -T simultanément"
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr "impossible de copier vers le même nom de conteneur"
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 #, fuzzy
 msgid "You must specify a destination instance name when using --target"
 msgstr "vous devez spécifier un nom de conteneur source"
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 #, fuzzy
 msgid "You must specify a source instance name"
 msgstr "vous devez spécifier un nom de conteneur source"
@@ -3785,7 +3803,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3813,7 +3831,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3976,6 +3994,18 @@ msgstr "désactivé"
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -4056,7 +4086,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4082,7 +4112,7 @@ msgstr "Expire : %s"
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 #, fuzzy
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
@@ -4206,7 +4236,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -4261,6 +4291,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -4286,7 +4322,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -4381,7 +4417,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 #, fuzzy
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
@@ -4504,7 +4540,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 #, fuzzy
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
@@ -4647,7 +4683,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4675,7 +4711,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4833,7 +4869,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -5025,7 +5061,7 @@ msgstr "Colonnes"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "oui"
@@ -5050,10 +5086,6 @@ msgstr "oui"
 #~ msgid "ARCH"
 #~ msgstr "ARCH"
 
-#, fuzzy
-#~ msgid "Missing container.name name"
-#~ msgstr "Vous devez fournir le nom d'un conteneur pour : "
-
 #~ msgid "PERSISTENT"
 #~ msgstr "PERSISTANT"
 
diff --git a/po/hi.po b/po/hi.po
index 5abfa5ae2a..f69d5d86ae 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 99090be94d..352e0cadbd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 2af8a1ef12..5f64fb14b2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Luigi Operoso <brokenpip3 at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -276,6 +276,12 @@ msgstr ""
 "###   source: /home/chb/mnt/lxd_test/default.img\n"
 "###   zfs.pool_name: default"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -324,11 +330,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -345,7 +351,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIAS"
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITETTURA"
 
@@ -490,7 +496,7 @@ msgstr "Aggiornamento automatico: %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -499,7 +505,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -510,7 +516,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr "Proprietà errata: %s"
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -581,7 +587,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -653,8 +659,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -666,7 +672,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -686,7 +692,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -694,13 +700,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -714,7 +721,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -734,7 +741,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -750,7 +757,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -758,7 +765,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -855,7 +862,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -879,7 +886,7 @@ msgstr "Creazione del container in corso"
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -896,7 +903,7 @@ msgstr "DRIVER"
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -952,53 +959,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1082,7 +1090,7 @@ msgstr "Utilizzo disco:"
 msgid "Disks:"
 msgstr "Utilizzo disco:"
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1109,6 +1117,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 #, fuzzy
 msgid "Edit files in instances"
@@ -1155,11 +1167,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1178,7 +1190,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1230,17 +1242,17 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 #, fuzzy
 msgid "Export instance backups"
 msgstr "Creazione del container in corso"
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 #, fuzzy
 msgid "Export instances as backup tarballs."
 msgstr "Creazione del container in corso"
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "Creazione del container in corso"
@@ -1259,7 +1271,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1268,7 +1280,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1300,7 +1312,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1316,7 +1328,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1340,7 +1352,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Il nome del container è: %s"
@@ -1648,7 +1660,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1680,7 +1692,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Alias:"
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1870,7 +1882,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1891,7 +1903,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1986,12 +1998,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2012,11 +2024,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2024,6 +2036,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Il nome del container è: %s"
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2111,7 +2128,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -2119,7 +2136,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -2136,7 +2153,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2219,7 +2236,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2329,7 +2346,7 @@ msgstr "Password amministratore per %s: "
 msgid "Pause instances"
 msgstr "Creazione del container in corso"
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2347,8 +2364,8 @@ msgstr "Aggiornamento automatico: %s"
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2418,11 +2435,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 #, fuzzy
 msgid "Profile to apply to the target instance"
 msgstr "non tutti i profili dell'origine esistono nella destinazione"
@@ -2518,7 +2535,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Creazione del container in corso"
@@ -2576,7 +2593,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2601,7 +2618,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2714,7 +2731,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2887,7 +2904,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3063,7 +3080,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -3125,15 +3142,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3175,7 +3192,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr "il remote %s non esiste"
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3233,7 +3250,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3251,11 +3268,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3264,7 +3281,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "Creazione del container in corso"
@@ -3288,7 +3305,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3317,7 +3334,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 #, fuzzy
 msgid "Unset all profiles on the target instance"
 msgstr "non tutti i profili dell'origine esistono nella destinazione"
@@ -3360,7 +3377,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3374,7 +3391,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3412,7 +3429,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3439,12 +3456,12 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 #, fuzzy
 msgid "You must specify a destination instance name when using --target"
 msgstr "Occorre specificare un nome di container come origine"
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 #, fuzzy
 msgid "You must specify a source instance name"
 msgstr "Occorre specificare un nome di container come origine"
@@ -3500,7 +3517,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3524,7 +3541,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3645,6 +3662,11 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr "Creazione del container in corso"
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3689,7 +3711,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3715,7 +3737,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3805,7 +3827,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3854,6 +3876,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3879,7 +3907,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3964,7 +3992,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -4075,7 +4103,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 #, fuzzy
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
@@ -4174,7 +4202,7 @@ msgstr "Creazione del container in corso"
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4195,7 +4223,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4284,7 +4312,7 @@ msgstr "Creazione del container in corso"
 msgid "show [<remote>:]<instance|profile>"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4429,7 +4457,7 @@ msgstr "Colonne"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "si"
diff --git a/po/ja.po b/po/ja.po
index 91d29df8eb..bd8dcfde0e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2020-03-12 15:28+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -275,6 +275,12 @@ msgstr ""
 "###\n"
 "### Note that the name is shown but cannot be changed"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -324,11 +330,11 @@ msgstr "- ポート %d (%s)"
 msgid "--empty cannot be combined with an image name"
 msgstr "--empty はイメージ名と同時に指定できません"
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr "--instance-only はコピー元がスナップショットの場合は指定できません"
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr "--refresh はインスタンスの場合のみ使えます"
 
@@ -345,7 +351,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTURE"
 
@@ -501,7 +507,7 @@ msgstr "自動更新: %s"
 msgid "BASE IMAGE"
 msgstr "BASE IMAGE"
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr "バックアップのエクスポートが成功しました!"
 
@@ -510,7 +516,7 @@ msgstr "バックアップのエクスポートが成功しました!"
 msgid "Bad key/value pair: %s"
 msgstr "不適切なキー/値のペア: %s"
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -521,7 +527,7 @@ msgstr "不適切な キー=値 のペア: %s"
 msgid "Bad property: %s"
 msgstr "不正なイメージプロパティ形式: %s"
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -592,7 +598,7 @@ msgstr "キャッシュ済: %s"
 msgid "Caches:"
 msgstr "キャッシュ:"
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr "ローカル上のリネームでは、設定やプロファイルの上書きはできません"
 
@@ -664,8 +670,8 @@ msgid "Client version: %s\n"
 msgstr "クライアントバージョン: %s\n"
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -677,7 +683,7 @@ msgstr "クライアントバージョン: %s\n"
 msgid "Cluster member name"
 msgstr "クラスタメンバ名"
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr "クラスタリングが有効になりました"
 
@@ -701,7 +707,7 @@ msgstr ""
 "LXD の機能のすべてが、以下の色々なコマンドから操作できます。\n"
 "コマンドのヘルプは、--help をコマンドに付けて実行するだけです。"
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr "新しいインスタンスに適用するキー/値の設定"
 
@@ -709,13 +715,14 @@ msgstr "新しいインスタンスに適用するキー/値の設定"
 msgid "Config key/value to apply to the new project"
 msgstr "新しいプロジェクトに適用するキー/値の設定"
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr "移動先のインスタンスに適用するキー/値の設定"
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "設定の構文エラー: %s"
@@ -729,7 +736,7 @@ msgstr "コンソールログ:"
 msgid "Control: %s (%s)"
 msgstr "コントロール: %s (%s)"
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr "ステートフルなインスタンスをステートレスにコピーします"
 
@@ -753,7 +760,7 @@ msgstr ""
 "自動更新フラグは、このイメージを最新に保つようにサーバに指示します。\n"
 "ソースはエイリアスで、かつパブリックである必要があります。"
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr "LXD サーバ内で、またはサーバ間でインスタンスをコピーします"
 
@@ -769,7 +776,7 @@ msgstr "プロファイルをコピーします"
 msgid "Copy storage volumes"
 msgstr "ストレージボリュームをコピーします"
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr "インスタンスをコピーします。スナップショットはコピーしません"
 
@@ -777,7 +784,7 @@ msgstr "インスタンスをコピーします。スナップショットはコ
 msgid "Copy the volume without its snapshots"
 msgstr "ボリュームをコピーします (スナップショットはコピーしません)"
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr "コピー/移動元とは異なるプロジェクトにコピーします"
 
@@ -872,7 +879,7 @@ msgstr "プロジェクトを作成します"
 msgid "Create storage pools"
 msgstr "ストレージプールを作成します"
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr "プロファイルを適用しないインスタンスを作成します"
 
@@ -895,7 +902,7 @@ msgstr "インスタンスを作成中"
 msgid "Current number of VFs: %d"
 msgstr "現在の VF 数: %d"
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr "DATABASE"
 
@@ -912,7 +919,7 @@ msgstr "DRIVER"
 msgid "DRM:"
 msgstr "DRM:"
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr "圧縮アルゴリズムを指定します: backup or none"
 
@@ -966,53 +973,54 @@ msgstr "ストレージボリュームを削除します"
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr "説明"
 
@@ -1096,7 +1104,7 @@ msgstr "ディスク:"
 msgid "Disks:"
 msgstr "ディスク:"
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr "--force を使う際にユーザーの確認を必要としない"
 
@@ -1125,6 +1133,11 @@ msgstr ""
 "ファイル転送のサーバ側の初期処理はキャンセルできません(強制的に中断するには"
 "あと2回行ってください)"
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+#, fuzzy
+msgid "Edit cluster member configurations as YAML"
+msgstr "インスタンスもしくはサーバの設定をYAMLファイルで編集します"
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr "インスタンス内のファイルを編集します"
@@ -1171,12 +1184,12 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 "'%s' 中のカラムエントリが空です (カラムの指定に空文字列が指定されています)"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 "クラスタリングで動作していないLXDサーバ上でクラスタリングを有効にします"
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1204,7 +1217,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "環境変数を設定します (例: HOME=/home/foo)"
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr "Ephemeral インスタンス"
 
@@ -1270,15 +1283,15 @@ msgstr ""
 "\n"
 "出力先はオプショナルで、デフォルトは現在のディレクトリです。"
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr "インスタンスのバックアップをエクスポートします"
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr "インスタンスを tarball 形式のバックアップとしてエクスポートします。"
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr "バックアップのエクスポート中: %s"
@@ -1297,7 +1310,7 @@ msgstr "FILENAME"
 msgid "FINGERPRINT"
 msgstr "FINGERPRINT"
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr "クラスタメンバへの接続に失敗しました"
 
@@ -1306,7 +1319,7 @@ msgstr "クラスタメンバへの接続に失敗しました"
 msgid "Failed to create alias %s"
 msgstr "エイリアス %s の作成に失敗しました"
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr "新しいインスタンス名が取得できません"
 
@@ -1337,7 +1350,7 @@ msgstr "証明書のフィンガープリント: %s"
 msgid "Force pseudo-terminal allocation"
 msgstr "強制的に擬似端末を割り当てます"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr "degraded 状態であっても強制的にメンバを削除します"
 
@@ -1353,7 +1366,7 @@ msgstr "稼働中のインスタンスを強制的に削除します"
 msgid "Force using the local unix socket"
 msgstr "強制的にローカルのUNIXソケットを使います"
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1392,7 +1405,7 @@ msgstr ""
 "\n"
 "本当に強制的に %s を削除してもよろしいですか? (yes/no): "
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1599,7 +1612,7 @@ msgstr "入力するデータ"
 msgid "Instance name is mandatory"
 msgstr "インスタンス名を指定する必要があります"
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr "インスタンス名: %s"
@@ -1707,7 +1720,7 @@ msgstr "LOCATION"
 msgid "LXD - Command line client"
 msgstr "LXD - コマンドラインクライアント"
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr "LXD サーバはクラスタの一部ではありません"
 
@@ -1738,7 +1751,7 @@ msgstr "DHCP のリースを一覧表示します"
 msgid "List aliases"
 msgstr "エイリアスを一覧表示します"
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr "クラスタのメンバをすべて一覧表示します"
 
@@ -2015,7 +2028,7 @@ msgstr "MAD: %s (%s)"
 msgid "MANAGED"
 msgstr "MANAGED"
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
@@ -2036,7 +2049,7 @@ msgstr "イメージを public にする"
 msgid "Manage and attach instances to networks"
 msgstr "ネットワークを管理し、インスタンスをネットワークに接続します"
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr "クラスタのメンバを管理します"
 
@@ -2145,12 +2158,12 @@ msgstr "信頼済みのクライアントを管理します"
 msgid "Maximum number of VFs: %d"
 msgstr "VF の最大数: %d"
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr "メンバ %s が削除されました"
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr "メンバ名 %s を %s に変更しました"
@@ -2171,11 +2184,11 @@ msgstr "メモリ消費量:"
 msgid "Memory:"
 msgstr "メモリ:"
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr "マイグレーション API が失敗しました"
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr "マイグレーションが失敗しました"
 
@@ -2183,6 +2196,11 @@ msgstr "マイグレーションが失敗しました"
 msgid "Minimum level for log messages"
 msgstr "表示するログメッセージの最小レベル"
 
+#: lxc/cluster.go:454
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "クラスタメンバ名"
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2273,7 +2291,7 @@ msgstr ""
 "ダウンロード対象のファイルが複数ありますが、コピー先がディレクトリではありま"
 "せん"
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr "LXD サーバ内もしくはサーバ間でインスタンスを移動します"
 
@@ -2281,7 +2299,7 @@ msgstr "LXD サーバ内もしくはサーバ間でインスタンスを移動
 msgid "Move storage volumes between pools"
 msgstr "プール間でストレージボリュームを移動します"
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr "インスタンスを移動します。スナップショットは移動しません"
 
@@ -2298,7 +2316,7 @@ msgstr "ディレクトリからのインポートは root で実行する必要
 msgid "Must supply instance name for: "
 msgstr "インスタンス名を指定する必要があります: "
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2381,7 +2399,7 @@ msgstr "新しいエイリアスを定義する"
 msgid "New aliases to add to the image"
 msgstr "イメージに新しいエイリアスを追加します"
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr "指定するデバイスに適用する新しいキー/値"
 
@@ -2490,7 +2508,7 @@ msgstr "%s のパスワード: "
 msgid "Pause instances"
 msgstr "インスタンスを一時停止します"
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr "インクリメンタルコピーを実行します"
 
@@ -2508,8 +2526,8 @@ msgstr "ポートタイプ: %s"
 msgid "Ports:"
 msgstr "ポート:"
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr "再度エディタを開くためには Enter キーを押します"
 
@@ -2579,11 +2597,11 @@ msgstr "プロファイル %s が %s から削除されました"
 msgid "Profile %s renamed to %s"
 msgstr "プロファイル名 %s を %s に変更しました"
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr "新しいインスタンスに適用するプロファイル"
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr "移動先のインスタンスに適用するプロファイル"
 
@@ -2677,7 +2695,7 @@ msgstr "再帰的にファイルを転送します"
 msgid "Refresh images"
 msgstr "イメージを更新します"
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr "インスタンスの更新中: %s"
@@ -2735,7 +2753,7 @@ msgstr "リムーバブルディスク: %v"
 msgid "Remove %s (yes/no): "
 msgstr "%s を消去しますか (yes/no): "
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr "クラスタからメンバを削除します"
 
@@ -2759,7 +2777,7 @@ msgstr "リモートサーバを削除します"
 msgid "Remove trusted clients"
 msgstr "信頼済みクライアントを削除します"
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr "クラスタメンバの名前を変更します"
 
@@ -2876,7 +2894,7 @@ msgstr "SOURCE"
 msgid "SR-IOV information:"
 msgstr "SR-IOV 情報:"
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr "STATE"
 
@@ -3081,7 +3099,7 @@ msgstr "詳細な情報を出力します"
 msgid "Show content of instance file templates"
 msgstr "インスタンスのファイルテンプレートの内容を表示します"
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr "クラスタメンバの詳細を表示します"
 
@@ -3256,7 +3274,7 @@ msgstr "ストレージプール %s を削除しました"
 msgid "Storage pool %s pending on member %s"
 msgstr "ストレージプール %s はメンバ %s 上でペンディング状態です"
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr "ストレージプール名"
 
@@ -3317,15 +3335,15 @@ msgstr "TARGET"
 msgid "TYPE"
 msgstr "TYPE"
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr "--instance-only と --target は同時に指定できません"
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr "--mode と --target は同時に指定できません"
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr "--stateless と --target は同時に指定できません"
 
@@ -3371,7 +3389,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr "プロファイルのデバイスが存在しません"
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr "移動元の LXD サーバはクラスタに属していません"
 
@@ -3445,7 +3463,7 @@ msgstr ""
 "ください"
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 "--target オプションは、コピー先のリモートサーバがクラスタに属していなければな"
@@ -3465,11 +3483,11 @@ msgstr "トランシーバータイプ: %s"
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpull)"
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpull)"
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpull)。"
 
@@ -3478,7 +3496,7 @@ msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpu
 msgid "Transferring image: %s"
 msgstr "イメージを転送中: %s"
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr "インスタンスを転送中: %s"
@@ -3502,7 +3520,7 @@ msgstr "タイプ: %s (ephemeral)"
 msgid "UPLOAD DATE"
 msgstr "UPLOAD DATE"
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr "URL"
 
@@ -3531,7 +3549,7 @@ msgstr "未知のカラム名の短縮形です '%c' ('%s' 中)"
 msgid "Unknown file type '%s'"
 msgstr "未知のファイルタイプ '%s'"
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr "移動先のインスタンスのすべてのプロファイルを削除します"
 
@@ -3573,7 +3591,7 @@ msgstr "サポートされていないインスタンスタイプです: %s"
 msgid "Uploaded: %s"
 msgstr "アップロード日時: %s"
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3589,7 +3607,7 @@ msgstr "使用済: %v"
 msgid "User ID to run the command as (default 0)"
 msgstr "コマンドを実行する際のユーザ ID (UID) (デフォルト 0)"
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr "ユーザが削除操作を中断しました"
 
@@ -3629,7 +3647,7 @@ msgstr "WWN: %s"
 msgid "Wait for the operation to complete"
 msgstr "処理が完全に終わるまで待ちます"
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "スナップショットを含めずにインスタンスのみをバックアップするかどうか"
 
@@ -3658,12 +3676,12 @@ msgstr "-t と -T は同時に指定できません"
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr "--mode と同時に -t または -T は指定できません"
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 "--target オプションを使うときはコピー先のインスタンス名を指定してください"
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr "コピー元のインスタンス名を指定してください"
 
@@ -3719,7 +3737,7 @@ msgstr ""
 "attach-profile [<remote>:]<network> <profile> [<device name>] [<interface "
 "name>]"
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr "cluster"
 
@@ -3743,7 +3761,7 @@ msgstr "copy [<remote>:]<image> <remote>:"
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr "copy [<remote>:]<profile> [<remote>:]<profile>"
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 
@@ -3863,6 +3881,11 @@ msgstr "無効"
 msgid "driver"
 msgstr "ドライバ"
 
+#: lxc/cluster.go:419
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr "edit [<remote>:]<image>"
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr "edit [<remote>:]<image>"
@@ -3903,7 +3926,7 @@ msgstr "edit [<remote>:]<project>"
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "edit [<remote>:][<instance>[/<snapshot>]]"
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr "enable [<remote>:] <name>"
 
@@ -3929,7 +3952,7 @@ msgstr "%s に失効"
 msgid "export [<remote>:]<image> [<target>]"
 msgstr "export [<remote>:]<image> [<target>]"
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -4019,7 +4042,7 @@ msgstr "launch [<remote>:]<image> [<remote>:][<name>]"
 msgid "list"
 msgstr "list"
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr "list [<remote>:]"
@@ -4072,6 +4095,15 @@ msgstr ""
 "lxc alias rename list my-list\n"
 "    エイリアス名 \"list\" を \"my-list\" に変更します。"
 
+#: lxc/cluster.go:423
+#, fuzzy
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+"lxc storage edit [<remote>:]<pool> < pool.yaml\n"
+"    pool.yaml の内容でストレージプールを更新します。"
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -4110,7 +4142,7 @@ msgstr ""
 "lxc config set core.trust_password=blah\n"
 "    サーバの認証パスワードを blah に設定します。"
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -4241,7 +4273,7 @@ msgstr ""
 "lxc monitor --type=lifecycle\n"
 "    lifecycle イベントのみを表示します。"
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -4401,7 +4433,7 @@ msgstr "monitor [<remote>:]"
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr "move [<pool>/]<volume> [<pool>/]<volume>"
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -4501,7 +4533,7 @@ msgstr "remove [<remote>:]<instance> <profile>"
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr "remove [<remote>:]<instance|profile> <name>..."
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr "remove [<remote>:]<member>"
 
@@ -4521,7 +4553,7 @@ msgstr "rename [<remote>:]<alias> <new-name>"
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr "rename [<remote>:]<member> <new-name>"
 
@@ -4605,7 +4637,7 @@ msgstr "show [<remote>:]<instance> <template>"
 msgid "show [<remote>:]<instance|profile>"
 msgstr "show [<remote>:]<instance|profile>"
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr "show [<remote>:]<member>"
 
@@ -4742,7 +4774,7 @@ msgstr "volume"
 msgid "y"
 msgstr "y"
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "yes"
diff --git a/po/ko.po b/po/ko.po
index 49a53b2ff3..2746d9ff51 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/lxd.pot b/po/lxd.pot
index 387be6427a..68fbe2ad88 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2020-03-25 13:23-0400\n"
+        "POT-Creation-Date: 2020-03-26 18:43-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"
@@ -152,6 +152,11 @@ msgid   "### This is a YAML representation of the project.\n"
         "### Note that the name is shown but cannot be changed"
 msgstr  ""
 
+#: lxc/cluster.go:433
+msgid   "### This is a yaml representation of the cluster member.\n"
+        "### Any line starting with a '# will be ignored."
+msgstr  ""
+
 #: lxc/info.go:293
 #, c-format
 msgid   "%d (id: %d, online: %v)"
@@ -200,11 +205,11 @@ msgstr  ""
 msgid   "--empty cannot be combined with an image name"
 msgstr  ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid   "--instance-only can't be passed when the source is a snapshot"
 msgstr  ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid   "--refresh can only be used with instances"
 msgstr  ""
 
@@ -220,7 +225,7 @@ msgstr  ""
 msgid   "ALIASES"
 msgstr  ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid   "ARCHITECTURE"
 msgstr  ""
 
@@ -361,7 +366,7 @@ msgstr  ""
 msgid   "BASE IMAGE"
 msgstr  ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid   "Backup exported successfully!"
 msgstr  ""
 
@@ -370,7 +375,7 @@ msgstr  ""
 msgid   "Bad key/value pair: %s"
 msgstr  ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172 lxc/storage.go:123 lxc/storage_volume.go:505
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172 lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid   "Bad key=value pair: %s"
 msgstr  ""
@@ -380,7 +385,7 @@ msgstr  ""
 msgid   "Bad property: %s"
 msgstr  ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid   "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr  ""
@@ -450,7 +455,7 @@ msgstr  ""
 msgid   "Caches:"
 msgstr  ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid   "Can't override configuration or profiles in local rename"
 msgstr  ""
 
@@ -520,11 +525,11 @@ msgstr  ""
 msgid   "Client version: %s\n"
 msgstr  ""
 
-#: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601 lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54 lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730 lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146 lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588 lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306 lxc/storage_volume.go:466 lxc/storage_volume.go:543 lxc/storage_volume.go:785 lxc/storage_volume.go:982 lxc/storage_volume.go:1147 lxc/storage_volume.go:1177 lxc/storage_volume.go:1293 lxc/storage_volume.go:1372 lxc/storage_volume.go:1465
+#: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601 lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54 lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730 lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146 lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588 lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306 lxc/storage_volume.go:466 lxc/storage_volume.go:543 lxc/storage_volume.go:785 lxc/storage_volume.go:982 lxc/storage_volume.go:1147 lxc/storage_volume.go:1177 lxc/storage_volume.go:1293 lxc/storage_volume.go:1372 lxc/storage_volume.go:1465
 msgid   "Cluster member name"
 msgstr  ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid   "Clustering enabled"
 msgstr  ""
 
@@ -543,7 +548,7 @@ msgid   "Command line client for LXD\n"
         "For help with any of those, simply call them with --help."
 msgstr  ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid   "Config key/value to apply to the new instance"
 msgstr  ""
 
@@ -551,11 +556,11 @@ msgstr  ""
 msgid   "Config key/value to apply to the new project"
 msgstr  ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid   "Config key/value to apply to the target instance"
 msgstr  ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid   "Config parsing error: %s"
 msgstr  ""
@@ -569,7 +574,7 @@ msgstr  ""
 msgid   "Control: %s (%s)"
 msgstr  ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid   "Copy a stateful instance stateless"
 msgstr  ""
 
@@ -588,7 +593,7 @@ msgid   "Copy images between servers\n"
         "It requires the source to be an alias and for it to be public."
 msgstr  ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid   "Copy instances within or in between LXD servers"
 msgstr  ""
 
@@ -604,7 +609,7 @@ msgstr  ""
 msgid   "Copy storage volumes"
 msgstr  ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid   "Copy the instance without its snapshots"
 msgstr  ""
 
@@ -612,7 +617,7 @@ msgstr  ""
 msgid   "Copy the volume without its snapshots"
 msgstr  ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid   "Copy to a project different from the source"
 msgstr  ""
 
@@ -702,7 +707,7 @@ msgstr  ""
 msgid   "Create storage pools"
 msgstr  ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid   "Create the instance with no profiles applied"
 msgstr  ""
 
@@ -725,7 +730,7 @@ msgstr  ""
 msgid   "Current number of VFs: %d"
 msgstr  ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid   "DATABASE"
 msgstr  ""
 
@@ -741,7 +746,7 @@ msgstr  ""
 msgid   "DRM:"
 msgstr  ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid   "Define a compression algorithm: for backup or none"
 msgstr  ""
 
@@ -793,7 +798,7 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147 lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27 lxc/config_metadata.go:52 lxc/config_metadata.go:174 lxc/config_template.go:28 lxc/config_template.go:65 lxc/config_template.go:108 lxc/config_template.go:150 lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219 lxc/storage_volume.go:302 lxc/storage_volume.go:463 lxc/storage_volume.go:540 lxc/storage_volume.go:616 lxc/storage_volume.go:698 lxc/storage_volume.go:779 lxc/storage_volume.go:979 lxc/storage_volume.go:1070 lxc/storage_volume.go:1143 lxc/storage_volume.go:1174 lxc/storage_volume.go:1287 lxc/storage_volume.go:1363 lxc/storage_volume.go:1462 lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153 lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421 lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27 lxc/config_metadata.go:52 lxc/config_metadata.go:174 lxc/config_template.go:28 lxc/config_template.go:65 lxc/config_template.go:108 lxc/config_template.go:150 lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31 lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219 lxc/storage_volume.go:302 lxc/storage_volume.go:463 lxc/storage_volume.go:540 lxc/storage_volume.go:616 lxc/storage_volume.go:698 lxc/storage_volume.go:779 lxc/storage_volume.go:979 lxc/storage_volume.go:1070 lxc/storage_volume.go:1143 lxc/storage_volume.go:1174 lxc/storage_volume.go:1287 lxc/storage_volume.go:1363 lxc/storage_volume.go:1462 lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -875,7 +880,7 @@ msgstr  ""
 msgid   "Disks:"
 msgstr  ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid   "Don't require user confirmation for using --force"
 msgstr  ""
 
@@ -900,6 +905,10 @@ msgstr  ""
 msgid   "Early server side processing of file tranfer requests cannot be canceled (interrupt two more times to force)"
 msgstr  ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid   "Edit cluster member configurations as YAML"
+msgstr  ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid   "Edit files in instances"
 msgstr  ""
@@ -945,11 +954,11 @@ msgstr  ""
 msgid   "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr  ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid   "Enable clustering on a single non-clustered LXD server"
 msgstr  ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid   "Enable clustering on a single non-clustered LXD server\n"
         "\n"
         "  This command turns a non-clustered LXD server into the first member of a new\n"
@@ -964,7 +973,7 @@ msgstr  ""
 msgid   "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr  ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid   "Ephemeral instance"
 msgstr  ""
 
@@ -1013,15 +1022,15 @@ msgid   "Export and download images\n"
         "The output target is optional and defaults to the working directory."
 msgstr  ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid   "Export instance backups"
 msgstr  ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid   "Export instances as backup tarballs."
 msgstr  ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid   "Exporting the backup: %s"
 msgstr  ""
@@ -1039,7 +1048,7 @@ msgstr  ""
 msgid   "FINGERPRINT"
 msgstr  ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid   "Failed to connect to cluster member"
 msgstr  ""
 
@@ -1048,7 +1057,7 @@ msgstr  ""
 msgid   "Failed to create alias %s"
 msgstr  ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid   "Failed to get the new instance name"
 msgstr  ""
 
@@ -1079,7 +1088,7 @@ msgstr  ""
 msgid   "Force pseudo-terminal allocation"
 msgstr  ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid   "Force removing a member, even if degraded"
 msgstr  ""
 
@@ -1095,7 +1104,7 @@ msgstr  ""
 msgid   "Force using the local unix socket"
 msgstr  ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid   "Forcefully removing a server from the cluster should only be done as a last\n"
         "resort.\n"
@@ -1114,7 +1123,7 @@ msgid   "Forcefully removing a server from the cluster should only be done as a
         "Are you really sure you want to force removing %s? (yes/no): "
 msgstr  ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238 lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155 lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104 lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510 lxc/storage_volume.go:1072
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238 lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155 lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104 lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510 lxc/storage_volume.go:1072
 msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
@@ -1308,7 +1317,7 @@ msgstr  ""
 msgid   "Instance name is mandatory"
 msgstr  ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid   "Instance name is: %s"
 msgstr  ""
@@ -1410,7 +1419,7 @@ msgstr  ""
 msgid   "LXD - Command line client"
 msgstr  ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid   "LXD server isn't part of a cluster"
 msgstr  ""
 
@@ -1441,7 +1450,7 @@ msgstr  ""
 msgid   "List aliases"
 msgstr  ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid   "List all the cluster members"
 msgstr  ""
 
@@ -1621,7 +1630,7 @@ msgstr  ""
 msgid   "MANAGED"
 msgstr  ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid   "MESSAGE"
 msgstr  ""
 
@@ -1642,7 +1651,7 @@ msgstr  ""
 msgid   "Manage and attach instances to networks"
 msgstr  ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid   "Manage cluster members"
 msgstr  ""
 
@@ -1731,12 +1740,12 @@ msgstr  ""
 msgid   "Maximum number of VFs: %d"
 msgstr  ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid   "Member %s removed"
 msgstr  ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid   "Member %s renamed to %s"
 msgstr  ""
@@ -1757,11 +1766,11 @@ msgstr  ""
 msgid   "Memory:"
 msgstr  ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid   "Migration API failure"
 msgstr  ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid   "Migration operation failure"
 msgstr  ""
 
@@ -1769,6 +1778,10 @@ msgstr  ""
 msgid   "Minimum level for log messages"
 msgstr  ""
 
+#: lxc/cluster.go:454
+msgid   "Missing cluster member name"
+msgstr  ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198 lxc/config_template.go:89 lxc/config_template.go:132 lxc/config_template.go:174 lxc/config_template.go:261 lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198 lxc/profile.go:660
 msgid   "Missing instance name"
 msgstr  ""
@@ -1833,7 +1846,7 @@ msgstr  ""
 msgid   "More than one file to download, but target is not a directory"
 msgstr  ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid   "Move instances within or in between LXD servers"
 msgstr  ""
 
@@ -1841,7 +1854,7 @@ msgstr  ""
 msgid   "Move storage volumes between pools"
 msgstr  ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid   "Move the instance without its snapshots"
 msgstr  ""
 
@@ -1858,7 +1871,7 @@ msgstr  ""
 msgid   "Must supply instance name for: "
 msgstr  ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620 lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558 lxc/storage_volume.go:1119
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620 lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558 lxc/storage_volume.go:1119
 msgid   "NAME"
 msgstr  ""
 
@@ -1938,7 +1951,7 @@ msgstr  ""
 msgid   "New aliases to add to the image"
 msgstr  ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid   "New key/value to apply to a specific device"
 msgstr  ""
 
@@ -2047,7 +2060,7 @@ msgstr  ""
 msgid   "Pause instances"
 msgstr  ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid   "Perform an incremental copy"
 msgstr  ""
 
@@ -2065,7 +2078,7 @@ msgstr  ""
 msgid   "Ports:"
 msgstr  ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid   "Press enter to open the editor again"
 msgstr  ""
 
@@ -2134,11 +2147,11 @@ msgstr  ""
 msgid   "Profile %s renamed to %s"
 msgstr  ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid   "Profile to apply to the new instance"
 msgstr  ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid   "Profile to apply to the target instance"
 msgstr  ""
 
@@ -2232,7 +2245,7 @@ msgstr  ""
 msgid   "Refresh images"
 msgstr  ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid   "Refreshing instance: %s"
 msgstr  ""
@@ -2289,7 +2302,7 @@ msgstr  ""
 msgid   "Remove %s (yes/no): "
 msgstr  ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid   "Remove a member from the cluster"
 msgstr  ""
 
@@ -2313,7 +2326,7 @@ msgstr  ""
 msgid   "Remove trusted clients"
 msgstr  ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid   "Rename a cluster member"
 msgstr  ""
 
@@ -2420,7 +2433,7 @@ msgstr  ""
 msgid   "SR-IOV information:"
 msgstr  ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid   "STATE"
 msgstr  ""
 
@@ -2577,7 +2590,7 @@ msgstr  ""
 msgid   "Show content of instance file templates"
 msgstr  ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid   "Show details of a cluster member"
 msgstr  ""
 
@@ -2752,7 +2765,7 @@ msgstr  ""
 msgid   "Storage pool %s pending on member %s"
 msgstr  ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid   "Storage pool name"
 msgstr  ""
 
@@ -2812,15 +2825,15 @@ msgstr  ""
 msgid   "TYPE"
 msgstr  ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid   "The --instance-only flag can't be used with --target"
 msgstr  ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid   "The --mode flag can't be used with --target"
 msgstr  ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid   "The --stateless flag can't be used with --target"
 msgstr  ""
 
@@ -2858,7 +2871,7 @@ msgstr  ""
 msgid   "The profile device doesn't exist"
 msgstr  ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid   "The source LXD server is not clustered"
 msgstr  ""
 
@@ -2910,7 +2923,7 @@ msgstr  ""
 msgid   "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr  ""
 
-#: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634 lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634 lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid   "To use --target, the destination remote must be a cluster"
 msgstr  ""
 
@@ -2928,11 +2941,11 @@ msgstr  ""
 msgid   "Transfer mode, one of pull (default), push or relay"
 msgstr  ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid   "Transfer mode. One of pull (default), push or relay"
 msgstr  ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid   "Transfer mode. One of pull (default), push or relay."
 msgstr  ""
 
@@ -2941,7 +2954,7 @@ msgstr  ""
 msgid   "Transferring image: %s"
 msgstr  ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid   "Transferring instance: %s"
 msgstr  ""
@@ -2965,7 +2978,7 @@ msgstr  ""
 msgid   "UPLOAD DATE"
 msgstr  ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid   "URL"
 msgstr  ""
 
@@ -2993,7 +3006,7 @@ msgstr  ""
 msgid   "Unknown file type '%s'"
 msgstr  ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid   "Unset all profiles on the target instance"
 msgstr  ""
 
@@ -3035,7 +3048,7 @@ msgstr  ""
 msgid   "Uploaded: %s"
 msgstr  ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid   "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr  ""
 
@@ -3048,7 +3061,7 @@ msgstr  ""
 msgid   "User ID to run the command as (default 0)"
 msgstr  ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid   "User aborted delete operation"
 msgstr  ""
 
@@ -3085,7 +3098,7 @@ msgstr  ""
 msgid   "Wait for the operation to complete"
 msgstr  ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid   "Whether or not to only backup the instance (without snapshots)"
 msgstr  ""
 
@@ -3109,11 +3122,11 @@ msgstr  ""
 msgid   "You can't pass -t or -T at the same time as --mode"
 msgstr  ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid   "You must specify a destination instance name when using --target"
 msgstr  ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid   "You must specify a source instance name"
 msgstr  ""
 
@@ -3161,7 +3174,7 @@ msgstr  ""
 msgid   "attach-profile [<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr  ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid   "cluster"
 msgstr  ""
 
@@ -3185,7 +3198,7 @@ msgstr  ""
 msgid   "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr  ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid   "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr  ""
 
@@ -3301,6 +3314,10 @@ msgstr  ""
 msgid   "driver"
 msgstr  ""
 
+#: lxc/cluster.go:419
+msgid   "edit [<remote>:]<cluster member>"
+msgstr  ""
+
 #: lxc/image.go:319
 msgid   "edit [<remote>:]<image>"
 msgstr  ""
@@ -3341,7 +3358,7 @@ msgstr  ""
 msgid   "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid   "enable [<remote>:] <name>"
 msgstr  ""
 
@@ -3367,7 +3384,7 @@ msgstr  ""
 msgid   "export [<remote>:]<image> [<target>]"
 msgstr  ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid   "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr  ""
 
@@ -3451,7 +3468,7 @@ msgstr  ""
 msgid   "list"
 msgstr  ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid   "list [<remote>:]"
 msgstr  ""
 
@@ -3494,6 +3511,11 @@ msgid   "lxc alias rename list my-list\n"
         "    Rename existing alias \"list\" to \"my-list\"."
 msgstr  ""
 
+#: lxc/cluster.go:423
+msgid   "lxc cluster edit <cluster member> < member.yaml\n"
+        "    Update a cluster member using the content of member.yaml"
+msgstr  ""
+
 #: lxc/config_device.go:79
 msgid   "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/c1 path=opt\n"
         "    Will mount the host's /share/c1 onto /opt in the instance."
@@ -3515,7 +3537,7 @@ msgid   "lxc config set [<remote>:]<instance> limits.cpu=2\n"
         "    Will set the server's trust password to blah."
 msgstr  ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid   "lxc export u1 backup0.tar.gz\n"
         "    Download a backup tarball of the u1 instance."
 msgstr  ""
@@ -3586,7 +3608,7 @@ msgid   "lxc monitor --type=logging\n"
         "    Only show lifecycle events."
 msgstr  ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid   "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--instance-only]\n"
         "    Move an instance between two hosts, renaming it if destination name differs.\n"
         "\n"
@@ -3680,7 +3702,7 @@ msgstr  ""
 msgid   "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr  ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid   "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
@@ -3768,7 +3790,7 @@ msgstr  ""
 msgid   "remove [<remote>:]<instance|profile> <name>..."
 msgstr  ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid   "remove [<remote>:]<member>"
 msgstr  ""
 
@@ -3788,7 +3810,7 @@ msgstr  ""
 msgid   "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr  ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid   "rename [<remote>:]<member> <new-name>"
 msgstr  ""
 
@@ -3868,7 +3890,7 @@ msgstr  ""
 msgid   "show [<remote>:]<instance|profile>"
 msgstr  ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid   "show [<remote>:]<member>"
 msgstr  ""
 
@@ -4005,7 +4027,7 @@ msgstr  ""
 msgid   "y"
 msgstr  ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879 lxc/image.go:1062
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879 lxc/image.go:1062
 msgid   "yes"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 1fa40f6435..774f5a57f8 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 8e8345c8f2..e82999cef1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -277,6 +277,12 @@ msgstr ""
 "###   source: /home/chb/mnt/lxd_test/default.img\n"
 "###   zfs.pool_name: default"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -325,11 +331,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -346,7 +352,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTUUR"
 
@@ -491,7 +497,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -500,7 +506,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -511,7 +517,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -581,7 +587,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -652,8 +658,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -665,7 +671,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -685,7 +691,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -693,13 +699,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -713,7 +720,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -733,7 +740,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -749,7 +756,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -757,7 +764,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -848,7 +855,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -871,7 +878,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -888,7 +895,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -942,53 +949,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1070,7 +1078,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1097,6 +1105,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1142,11 +1154,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1165,7 +1177,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1217,15 +1229,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1244,7 +1256,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1253,7 +1265,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1284,7 +1296,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1300,7 +1312,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1324,7 +1336,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1525,7 +1537,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1629,7 +1641,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1660,7 +1672,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1848,7 +1860,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1869,7 +1881,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1961,12 +1973,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1987,11 +1999,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1999,6 +2011,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2084,7 +2100,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -2092,7 +2108,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -2109,7 +2125,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2192,7 +2208,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2301,7 +2317,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2319,8 +2335,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2390,11 +2406,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2488,7 +2504,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2546,7 +2562,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2570,7 +2586,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2680,7 +2696,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2853,7 +2869,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3028,7 +3044,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -3089,15 +3105,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3138,7 +3154,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3196,7 +3212,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3214,11 +3230,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3227,7 +3243,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3251,7 +3267,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3280,7 +3296,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3322,7 +3338,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3336,7 +3352,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3374,7 +3390,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3401,11 +3417,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3457,7 +3473,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3481,7 +3497,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3599,6 +3615,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3639,7 +3659,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3665,7 +3685,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3752,7 +3772,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3799,6 +3819,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3824,7 +3850,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3909,7 +3935,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -4020,7 +4046,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -4114,7 +4140,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4134,7 +4160,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4216,7 +4242,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4353,7 +4379,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 09325f5e20..58b4f85a74 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 4f23eab627..bfe00eabb9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2018-09-08 19:22+0000\n"
 "Last-Translator: m4sk1n <me at m4sk.in>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/linux-containers/"
@@ -287,6 +287,12 @@ msgstr ""
 "###\n"
 "### Nazwa jest widoczna, ale nie może zostać zmieniona"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -335,11 +341,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -356,7 +362,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -501,7 +507,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -510,7 +516,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -521,7 +527,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -591,7 +597,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -662,8 +668,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -675,7 +681,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -695,7 +701,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -703,13 +709,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -723,7 +730,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -743,7 +750,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -759,7 +766,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -767,7 +774,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -858,7 +865,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -881,7 +888,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -898,7 +905,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -952,53 +959,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1080,7 +1088,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1107,6 +1115,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1152,11 +1164,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1175,7 +1187,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1227,15 +1239,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1254,7 +1266,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1263,7 +1275,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1294,7 +1306,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1310,7 +1322,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1334,7 +1346,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1535,7 +1547,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1639,7 +1651,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1670,7 +1682,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1858,7 +1870,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1879,7 +1891,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1971,12 +1983,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1997,11 +2009,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2009,6 +2021,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2094,7 +2110,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -2102,7 +2118,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -2119,7 +2135,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2202,7 +2218,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2311,7 +2327,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2329,8 +2345,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2400,11 +2416,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2498,7 +2514,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2556,7 +2572,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2580,7 +2596,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2690,7 +2706,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2863,7 +2879,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3038,7 +3054,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -3099,15 +3115,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3148,7 +3164,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3206,7 +3222,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3224,11 +3240,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3237,7 +3253,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3261,7 +3277,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3290,7 +3306,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3332,7 +3348,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3346,7 +3362,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3384,7 +3400,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3411,11 +3427,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3467,7 +3483,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3491,7 +3507,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3609,6 +3625,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3649,7 +3669,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3675,7 +3695,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3762,7 +3782,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3809,6 +3829,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3834,7 +3860,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3919,7 +3945,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -4030,7 +4056,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -4124,7 +4150,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4144,7 +4170,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4226,7 +4252,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4363,7 +4389,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f01cd1686d..bdf49bac4d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -286,6 +286,12 @@ msgstr ""
 "###   source: /home/chb/mnt/lxd_test/default.img\n"
 "###   zfs.pool_name: default"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -335,12 +341,12 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr "--refresh só pode ser usado com containers"
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 #, fuzzy
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr "--container-only não pode ser passado quando a fonte é um snapshot"
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 #, fuzzy
 msgid "--refresh can only be used with instances"
 msgstr "--refresh só pode ser usado com containers"
@@ -359,7 +365,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARQUITETURA"
 
@@ -511,7 +517,7 @@ msgstr "Atualização automática: %s"
 msgid "BASE IMAGE"
 msgstr "IMAGEM BASE"
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr "Backup exportado com sucesso!"
 
@@ -520,7 +526,7 @@ msgstr "Backup exportado com sucesso!"
 msgid "Bad key/value pair: %s"
 msgstr "par de chave/valor inválido %s"
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -531,7 +537,7 @@ msgstr "par de chave=valor inválido %s"
 msgid "Bad property: %s"
 msgstr "Propriedade ruim: %s"
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr "Erro de sintaxe, esperado <dispositivo>,<chave>=<valor>: %s"
@@ -602,7 +608,7 @@ msgstr "Em cache: %s"
 msgid "Caches:"
 msgstr "Em cache: %s"
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -674,8 +680,8 @@ msgid "Client version: %s\n"
 msgstr "Versão do cliente: %s\n"
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -687,7 +693,7 @@ msgstr "Versão do cliente: %s\n"
 msgid "Cluster member name"
 msgstr "Nome de membro do cluster"
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr "Clustering ativado"
 
@@ -712,7 +718,7 @@ msgstr ""
 "abaixo.\n"
 "Para obter ajuda com qualquer um desses, simplesmente use-os com --help."
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 #, fuzzy
 msgid "Config key/value to apply to the new instance"
 msgstr "Configuração chave/valor para aplicar ao novo contêiner"
@@ -721,14 +727,15 @@ msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 #, fuzzy
 msgid "Config key/value to apply to the target instance"
 msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "Erro de análise de configuração: %s"
@@ -742,7 +749,7 @@ msgstr "Log de Console:"
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -762,7 +769,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 #, fuzzy
 msgid "Copy instances within or in between LXD servers"
 msgstr "Copiar imagens entre servidores"
@@ -779,7 +786,7 @@ msgstr "Copiar perfis"
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -787,7 +794,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -886,7 +893,7 @@ msgstr "Criar projetos"
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -910,7 +917,7 @@ msgstr "Criando %s"
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -927,7 +934,7 @@ msgstr "DRIVER"
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 #, fuzzy
 msgid "Define a compression algorithm: for backup or none"
 msgstr "Definir um algoritmo de compressão: para imagem ou nenhum"
@@ -985,53 +992,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr "Descrição"
 
@@ -1117,7 +1125,7 @@ msgstr "Uso de disco:"
 msgid "Disks:"
 msgstr "Uso de disco:"
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1144,6 +1152,11 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+#, fuzzy
+msgid "Edit cluster member configurations as YAML"
+msgstr "Editar configurações do container ou do servidor como YAML"
+
 #: lxc/file.go:153 lxc/file.go:154
 #, fuzzy
 msgid "Edit files in instances"
@@ -1194,11 +1207,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1217,7 +1230,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1269,15 +1282,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1296,7 +1309,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1305,7 +1318,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1336,7 +1349,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr "Forçar alocação de pseudo-terminal"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1352,7 +1365,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1376,7 +1389,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1581,7 +1594,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1685,7 +1698,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1716,7 +1729,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1905,7 +1918,7 @@ msgstr "Em cache: %s"
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1926,7 +1939,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -2022,12 +2035,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2048,11 +2061,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2060,6 +2073,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Nome de membro do cluster"
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2145,7 +2163,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -2153,7 +2171,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -2170,7 +2188,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2253,7 +2271,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2362,7 +2380,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2380,8 +2398,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2451,12 +2469,12 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 #, fuzzy
 msgid "Profile to apply to the new instance"
 msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 #, fuzzy
 msgid "Profile to apply to the target instance"
 msgstr "Configuração chave/valor para aplicar ao novo contêiner"
@@ -2554,7 +2572,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Editar arquivos no container"
@@ -2612,7 +2630,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2637,7 +2655,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2747,7 +2765,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2924,7 +2942,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr "Editar templates de arquivo do container"
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3103,7 +3121,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -3165,15 +3183,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3214,7 +3232,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3272,7 +3290,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3290,11 +3308,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3303,7 +3321,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "Editar arquivos no container"
@@ -3327,7 +3345,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3356,7 +3374,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 #, fuzzy
 msgid "Unset all profiles on the target instance"
 msgstr "Não pode fornecer um nome para a imagem de destino"
@@ -3402,7 +3420,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3416,7 +3434,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3454,7 +3472,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3481,11 +3499,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3537,7 +3555,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3561,7 +3579,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3679,6 +3697,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3719,7 +3741,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3745,7 +3767,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3832,7 +3854,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3879,6 +3901,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3904,7 +3932,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3989,7 +4017,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -4100,7 +4128,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -4194,7 +4222,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4214,7 +4242,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4296,7 +4324,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4433,7 +4461,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "sim"
diff --git a/po/ru.po b/po/ru.po
index e1754843e2..afcb71b771 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2018-06-22 15:57+0000\n"
 "Last-Translator: Александр Киль <shorrey at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -288,6 +288,12 @@ msgstr ""
 "###\n"
 "### Обратите внимание, что имя отображается, но не может быть изменено"
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -336,11 +342,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -358,7 +364,7 @@ msgstr "ПСЕВДОНИМ"
 msgid "ALIASES"
 msgstr "ПСЕВДОНИМ"
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "АРХИТЕКТУРА"
 
@@ -505,7 +511,7 @@ msgstr "Авто-обновление: %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -514,7 +520,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -525,7 +531,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -597,7 +603,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -669,8 +675,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -682,7 +688,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -702,7 +708,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -710,13 +716,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -730,7 +737,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -750,7 +757,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -767,7 +774,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr "Копирование образа: %s"
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -775,7 +782,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -874,7 +881,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr "Копирование образа: %s"
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 #, fuzzy
 msgid "Create the instance with no profiles applied"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -899,7 +906,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -916,7 +923,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -974,53 +981,54 @@ msgstr "Копирование образа: %s"
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1106,7 +1114,7 @@ msgstr " Использование диска:"
 msgid "Disks:"
 msgstr " Использование диска:"
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1133,6 +1141,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1180,11 +1192,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1203,7 +1215,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1256,17 +1268,17 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 #, fuzzy
 msgid "Export instance backups"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 #, fuzzy
 msgid "Export instances as backup tarballs."
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "Копирование образа: %s"
@@ -1285,7 +1297,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1294,7 +1306,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1325,7 +1337,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1341,7 +1353,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1365,7 +1377,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1570,7 +1582,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr "Имя контейнера является обязательным"
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Имя контейнера: %s"
@@ -1674,7 +1686,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1706,7 +1718,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Псевдонимы:"
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1898,7 +1910,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1919,7 +1931,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -2016,12 +2028,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2044,11 +2056,11 @@ msgstr " Использование памяти:"
 msgid "Memory:"
 msgstr " Использование памяти:"
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2056,6 +2068,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Копирование образа: %s"
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -2144,7 +2161,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -2153,7 +2170,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr "Копирование образа: %s"
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -2170,7 +2187,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2254,7 +2271,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2364,7 +2381,7 @@ msgstr "Пароль администратора для %s: "
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2382,8 +2399,8 @@ msgstr "Авто-обновление: %s"
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2453,11 +2470,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2552,7 +2569,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr "Копирование образа: %s"
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -2610,7 +2627,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2635,7 +2652,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2750,7 +2767,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2924,7 +2941,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3103,7 +3120,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -3165,15 +3182,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3214,7 +3231,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3272,7 +3289,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3290,11 +3307,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3303,7 +3320,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -3327,7 +3344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3356,7 +3373,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3398,7 +3415,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3412,7 +3429,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3450,7 +3467,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3477,11 +3494,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3546,7 +3563,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3574,7 +3591,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3732,6 +3749,14 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3792,7 +3817,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3818,7 +3843,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 #, fuzzy
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
@@ -3933,7 +3958,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3988,6 +4013,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -4013,7 +4044,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -4098,7 +4129,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -4209,7 +4240,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 #, fuzzy
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
@@ -4339,7 +4370,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4363,7 +4394,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4497,7 +4528,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4675,7 +4706,7 @@ msgstr "Столбцы"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "да"
diff --git a/po/sl.po b/po/sl.po
index 7a52c7c680..9cbff7c1e9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index af418bde31..b235f2a336 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index f181539adb..67115f8555 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 42eaac107f..3c830b2f06 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index dcafe672d9..44e475d38f 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: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index e449560ffc..d9491607fa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -160,6 +160,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -208,11 +214,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -229,7 +235,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -374,7 +380,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +389,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +400,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +470,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -548,7 +554,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -576,13 +582,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -596,7 +603,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -731,7 +738,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -754,7 +761,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -771,7 +778,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -825,53 +832,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -953,7 +961,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -980,6 +988,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1025,11 +1037,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1100,15 +1112,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1136,7 +1148,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1195,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1207,7 +1219,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1512,7 +1524,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1543,7 +1555,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1731,7 +1743,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1752,7 +1764,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1844,12 +1856,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1870,11 +1882,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1882,6 +1894,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1967,7 +1983,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1975,7 +1991,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1992,7 +2008,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2075,7 +2091,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2184,7 +2200,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2202,8 +2218,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2273,11 +2289,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2371,7 +2387,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2563,7 +2579,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2736,7 +2752,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2911,7 +2927,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2972,15 +2988,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3079,7 +3095,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3097,11 +3113,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3110,7 +3126,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3163,7 +3179,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3205,7 +3221,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3219,7 +3235,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3257,7 +3273,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3284,11 +3300,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3340,7 +3356,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3364,7 +3380,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3482,6 +3498,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3635,7 +3655,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3682,6 +3702,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3707,7 +3733,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3792,7 +3818,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3903,7 +3929,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -3997,7 +4023,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4099,7 +4125,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4236,7 +4262,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index 4140ab7ce9..29df5385d6 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-25 13:23-0400\n"
+"POT-Creation-Date: 2020-03-26 18:43-0400\n"
 "PO-Revision-Date: 2018-09-11 19:15+0000\n"
 "Last-Translator: 0x0916 <w at laoqinren.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -163,6 +163,12 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
+#: lxc/cluster.go:433
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/info.go:293
 #, c-format
 msgid "%d (id: %d, online: %v)"
@@ -211,11 +217,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:152
+#: lxc/copy.go:151
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:163
+#: lxc/copy.go:162
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -232,7 +238,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:137 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -377,7 +383,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:134
+#: lxc/export.go:133
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -386,7 +392,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:121 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -397,7 +403,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:133
+#: lxc/copy.go:132
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -467,7 +473,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:108
+#: lxc/move.go:107
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -538,8 +544,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:52 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:57 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:401
+#: lxc/cluster.go:407
 msgid "Clustering enabled"
 msgstr ""
 
@@ -571,7 +577,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:45 lxc/init.go:48
+#: lxc/copy.go:44 lxc/init.go:48
 msgid "Config key/value to apply to the new instance"
 msgstr ""
 
@@ -579,13 +585,14 @@ msgstr ""
 msgid "Config key/value to apply to the new project"
 msgstr ""
 
-#: lxc/move.go:50
+#: lxc/move.go:49
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:255 lxc/config.go:328 lxc/config_metadata.go:142
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:502 lxc/config.go:255 lxc/config.go:328
+#: lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:918 lxc/storage_volume.go:948
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -599,7 +606,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/move.go:56
+#: lxc/copy.go:50 lxc/move.go:55
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -619,7 +626,7 @@ msgid ""
 "It requires the source to be an alias and for it to be public."
 msgstr ""
 
-#: lxc/copy.go:40 lxc/copy.go:41
+#: lxc/copy.go:39 lxc/copy.go:40
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
@@ -635,7 +642,7 @@ msgstr ""
 msgid "Copy storage volumes"
 msgstr ""
 
-#: lxc/copy.go:50
+#: lxc/copy.go:49
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
@@ -643,7 +650,7 @@ msgstr ""
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/move.go:59
+#: lxc/copy.go:53 lxc/move.go:58
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -734,7 +741,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/init.go:55
+#: lxc/copy.go:54 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -757,7 +764,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -774,7 +781,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:44
+#: lxc/export.go:43
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -828,53 +835,54 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:30
-#: lxc/config.go:89 lxc/config.go:358 lxc/config.go:439 lxc/config.go:597
-#: lxc/config.go:716 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
-#: lxc/config_template.go:28 lxc/config_template.go:65
-#: lxc/config_template.go:108 lxc/config_template.go:150
-#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
-#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
-#: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605
-#: lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
-#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
-#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:219 lxc/storage_volume.go:302
-#: lxc/storage_volume.go:463 lxc/storage_volume.go:540
-#: lxc/storage_volume.go:616 lxc/storage_volume.go:698
-#: lxc/storage_volume.go:779 lxc/storage_volume.go:979
-#: lxc/storage_volume.go:1070 lxc/storage_volume.go:1143
-#: lxc/storage_volume.go:1174 lxc/storage_volume.go:1287
-#: lxc/storage_volume.go:1363 lxc/storage_volume.go:1462
-#: lxc/storage_volume.go:1495 lxc/storage_volume.go:1571 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:153
+#: lxc/cluster.go:203 lxc/cluster.go:253 lxc/cluster.go:336 lxc/cluster.go:421
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:358 lxc/config.go:439
+#: lxc/config.go:597 lxc/config.go:716 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:27 lxc/config_metadata.go:52
+#: lxc/config_metadata.go:174 lxc/config_template.go:28
+#: lxc/config_template.go:65 lxc/config_template.go:108
+#: lxc/config_template.go:150 lxc/config_template.go:236
+#: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
+#: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31
+#: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833
+#: lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619
+#: lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33
+#: lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539
+#: lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219
+#: lxc/storage_volume.go:302 lxc/storage_volume.go:463
+#: lxc/storage_volume.go:540 lxc/storage_volume.go:616
+#: lxc/storage_volume.go:698 lxc/storage_volume.go:779
+#: lxc/storage_volume.go:979 lxc/storage_volume.go:1070
+#: lxc/storage_volume.go:1143 lxc/storage_volume.go:1174
+#: lxc/storage_volume.go:1287 lxc/storage_volume.go:1363
+#: lxc/storage_volume.go:1462 lxc/storage_volume.go:1495
+#: lxc/storage_volume.go:1571 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -956,7 +964,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:252
+#: lxc/cluster.go:258
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -983,6 +991,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:420 lxc/cluster.go:421
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in instances"
 msgstr ""
@@ -1028,11 +1040,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1051,7 +1063,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:48 lxc/init.go:50
+#: lxc/copy.go:47 lxc/init.go:50
 msgid "Ephemeral instance"
 msgstr ""
 
@@ -1103,15 +1115,15 @@ msgid ""
 "The output target is optional and defaults to the working directory."
 msgstr ""
 
-#: lxc/export.go:32
+#: lxc/export.go:31
 msgid "Export instance backups"
 msgstr ""
 
-#: lxc/export.go:33
+#: lxc/export.go:32
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:118
+#: lxc/export.go:117
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1130,7 +1142,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:230
+#: lxc/move.go:225
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1139,7 +1151,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:420
+#: lxc/copy.go:419
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1170,7 +1182,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1186,7 +1198,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:259
+#: lxc/cluster.go:265
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1210,7 +1222,7 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
 #: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
@@ -1411,7 +1423,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:426 lxc/init.go:343
+#: lxc/copy.go:425 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1515,7 +1527,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:104
+#: lxc/cluster.go:110
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1546,7 +1558,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1734,7 +1746,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1755,7 +1767,7 @@ msgstr ""
 msgid "Manage and attach instances to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1847,12 +1859,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:314
+#: lxc/cluster.go:320
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:227
+#: lxc/cluster.go:233
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1873,11 +1885,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:243
+#: lxc/move.go:238
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:248
+#: lxc/move.go:243
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1885,6 +1897,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:454
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:100 lxc/config_metadata.go:198
 #: lxc/config_template.go:89 lxc/config_template.go:132
 #: lxc/config_template.go:174 lxc/config_template.go:261
@@ -1970,7 +1986,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:36 lxc/move.go:37
+#: lxc/move.go:35 lxc/move.go:36
 msgid "Move instances within or in between LXD servers"
 msgstr ""
 
@@ -1978,7 +1994,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:54
+#: lxc/move.go:53
 msgid "Move the instance without its snapshots"
 msgstr ""
 
@@ -1995,7 +2011,7 @@ msgstr ""
 msgid "Must supply instance name for: "
 msgstr ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
 #: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1119
 msgid "NAME"
@@ -2078,7 +2094,7 @@ msgstr ""
 msgid "New aliases to add to the image"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/move.go:51
+#: lxc/copy.go:45 lxc/move.go:50
 msgid "New key/value to apply to a specific device"
 msgstr ""
 
@@ -2187,7 +2203,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:56
+#: lxc/copy.go:55
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2205,8 +2221,8 @@ msgstr ""
 msgid "Ports:"
 msgstr ""
 
-#: lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304
-#: lxc/storage_volume.go:919 lxc/storage_volume.go:949
+#: lxc/cluster.go:503 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:919 lxc/storage_volume.go:949
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2276,11 +2292,11 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:49
+#: lxc/copy.go:46 lxc/init.go:49
 msgid "Profile to apply to the new instance"
 msgstr ""
 
-#: lxc/move.go:52
+#: lxc/move.go:51
 msgid "Profile to apply to the target instance"
 msgstr ""
 
@@ -2374,7 +2390,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:387
+#: lxc/copy.go:386
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2432,7 +2448,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:246 lxc/cluster.go:247
+#: lxc/cluster.go:252 lxc/cluster.go:253
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2456,7 +2472,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:196 lxc/cluster.go:197
+#: lxc/cluster.go:202 lxc/cluster.go:203
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2566,7 +2582,7 @@ msgstr ""
 msgid "SR-IOV information:"
 msgstr ""
 
-#: lxc/cluster.go:129 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
+#: lxc/cluster.go:135 lxc/list.go:432 lxc/network.go:874 lxc/storage.go:563
 msgid "STATE"
 msgstr ""
 
@@ -2739,7 +2755,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:146 lxc/cluster.go:147
+#: lxc/cluster.go:152 lxc/cluster.go:153
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2914,7 +2930,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:52 lxc/move.go:56
 msgid "Storage pool name"
 msgstr ""
 
@@ -2975,15 +2991,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:160 lxc/move.go:164
+#: lxc/move.go:159
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:168
+#: lxc/move.go:163
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:156
+#: lxc/move.go:155
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3024,7 +3040,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:235
+#: lxc/move.go:230
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3082,7 +3098,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:114 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3100,11 +3116,11 @@ msgstr ""
 msgid "Transfer mode, one of pull (default), push or relay"
 msgstr ""
 
-#: lxc/copy.go:49
+#: lxc/copy.go:48
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:55 lxc/storage_volume.go:305
+#: lxc/move.go:54 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3113,7 +3129,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:353
+#: lxc/copy.go:352
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3137,7 +3153,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:518
+#: lxc/cluster.go:133 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3166,7 +3182,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/move.go:53
+#: lxc/move.go:52
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
@@ -3208,7 +3224,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:43
+#: lxc/export.go:42
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3222,7 +3238,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:278 lxc/delete.go:47
+#: lxc/cluster.go:284 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3260,7 +3276,7 @@ msgstr ""
 msgid "Wait for the operation to complete"
 msgstr ""
 
-#: lxc/export.go:41
+#: lxc/export.go:40
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3287,11 +3303,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:81
+#: lxc/copy.go:80
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:76 lxc/move.go:219
+#: lxc/copy.go:75 lxc/move.go:214
 msgid "You must specify a source instance name"
 msgstr ""
 
@@ -3343,7 +3359,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3367,7 +3383,7 @@ msgstr ""
 msgid "copy [<remote>:]<profile> [<remote>:]<profile>"
 msgstr ""
 
-#: lxc/copy.go:38
+#: lxc/copy.go:37
 msgid "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgstr ""
 
@@ -3485,6 +3501,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:419
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/image.go:319
 msgid "edit [<remote>:]<image>"
 msgstr ""
@@ -3525,7 +3545,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:328
+#: lxc/cluster.go:334
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3551,7 +3571,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/export.go:31
+#: lxc/export.go:30
 msgid ""
 "export [<remote>:]<instance> [target] [--instance-only] [--optimized-storage]"
 msgstr ""
@@ -3638,7 +3658,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3685,6 +3705,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:423
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]instance1 <device-name> disk source=/share/"
@@ -3710,7 +3736,7 @@ msgid ""
 "    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/export.go:35
+#: lxc/export.go:34
 msgid ""
 "lxc export u1 backup0.tar.gz\n"
 "    Download a backup tarball of the u1 instance."
@@ -3795,7 +3821,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:39
+#: lxc/move.go:38
 msgid ""
 "lxc move [<remote>:]<source instance> [<remote>:][<destination instance>] [--"
 "instance-only]\n"
@@ -3906,7 +3932,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:33
 msgid ""
 "move [<remote>:]<instance>[/<snapshot>] [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
@@ -4000,7 +4026,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:244
+#: lxc/cluster.go:250
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4020,7 +4046,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:194
+#: lxc/cluster.go:200
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4102,7 +4128,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:145
+#: lxc/cluster.go:151
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4239,7 +4265,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:283 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""


More information about the lxc-devel mailing list