[lxc-devel] [lxd/master] Add eventhub support (and editable roles)

stgraber on Github lxc-bot at linuxcontainers.org
Sun Nov 10 23:32:26 UTC 2019


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20191110/1978c861/attachment-0001.bin>
-------------- next part --------------
From ed2f6cd75cbdf9cfa0ef4aba587d4d377b300047 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:31:11 -0500
Subject: [PATCH 1/9] doc/api-extensions: Fix markdown
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 1ffb73084e..ea4c0923d6 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -867,5 +867,5 @@ Adds the `security.syscalls.intercept.mount`,
 and how the mount system call will be interecepted by LXD and processed with
 elevated permissions.
 
-## compression_squashfs
+## compression\_squashfs
 Adds support for importing/exporting of images/backups using SquashFS file system format.

From 0bcea5b89c494267b6a5e27cb65f66a708525462 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:35:07 -0500
Subject: [PATCH 2/9] api: Add clustering_eventhub
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 | 5 +++++
 shared/version/api.go | 1 +
 2 files changed, 6 insertions(+)

diff --git a/doc/api-extensions.md b/doc/api-extensions.md
index ea4c0923d6..75bb99659f 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -869,3 +869,8 @@ elevated permissions.
 
 ## compression\_squashfs
 Adds support for importing/exporting of images/backups using SquashFS file system format.
+
+## clustering\_eventhub
+This introduces the optional `eventhub` role to allow a number of LXD
+cluster members to handle relaying of events instead of the previous
+broadcast approach.
diff --git a/shared/version/api.go b/shared/version/api.go
index 6498b1d156..04bb6fb141 100644
--- a/shared/version/api.go
+++ b/shared/version/api.go
@@ -174,6 +174,7 @@ var APIExtensions = []string{
 	"ceph_data_pool_name",
 	"container_syscall_intercept_mount",
 	"compression_squashfs",
+	"clustering_eventhub",
 }
 
 // APIExtensionsCount returns the number of available API extensions.

From b5e3d74efa3dd6609d317557f4cda5a9a6ed949b 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 3/9] 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 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go
index b8b4456c1f..82f5afd945 100644
--- a/lxd/cluster/membership.go
+++ b/lxd/cluster/membership.go
@@ -549,11 +549,11 @@ func Rebalance(state *state.State, gateway *Gateway) (string, []db.RaftNode, err
 // Promote makes a LXD node which is not a database node, become part of the
 // raft cluster.
 func Promote(state *state.State, gateway *Gateway, nodes []db.RaftNode) error {
-	logger.Info("Promote node to database node")
+	logger.Info("Promote member to database role")
 
 	// Sanity check that this is not already a database node
 	if gateway.IsDatabaseNode() {
-		return fmt.Errorf("this node is already a database node")
+		return fmt.Errorf("This member is already serving the database")
 	}
 
 	// Figure out our own address.
@@ -562,7 +562,7 @@ func Promote(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
 	})
@@ -572,7 +572,7 @@ func Promote(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 raft node ID, and an existing target raft node that
@@ -590,7 +590,7 @@ func Promote(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 id == -1 {
-		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 raft nodes")
 	}
 
 	// Replace our local list of raft nodes with the given one (which
@@ -599,7 +599,7 @@ func Promote(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
@@ -612,14 +612,14 @@ func Promote(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")
 	}
 
 	// Wipe all existing raft data, for good measure (perhaps they were
 	// 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
@@ -657,7 +657,7 @@ func Promote(state *state.State, gateway *Gateway, nodes []db.RaftNode) error {
 		return err
 	})
 	if err != nil {
-		return errors.Wrap(err, "cluster database initialization failed")
+		return errors.Wrap(err, "Cluster database initialization failed")
 	}
 
 	return nil

From 0102b62686ba047bae099b84795162a18080556d 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:50:06 -0500
Subject: [PATCH 4/9] lxd/db: Introduce eventhub role
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxd/db/node.go b/lxd/db/node.go
index 1f6ffb8f7f..17c4d2aca8 100644
--- a/lxd/db/node.go
+++ b/lxd/db/node.go
@@ -21,9 +21,13 @@ type ClusterRole string
 // ClusterRoleDatabase represents the database role in a cluster.
 const ClusterRoleDatabase = ClusterRole("database")
 
+// ClusterRoleEventhub represents the database role in a cluster.
+const ClusterRoleEventhub = ClusterRole("eventhub")
+
 // ClusterRoles maps role ids into human-readable names.
 var ClusterRoles = map[int]ClusterRole{
 	0: ClusterRoleDatabase,
+	1: ClusterRoleEventhub,
 }
 
 // NodeInfo holds information about a single LXD instance in a cluster.

From 70845975e67eaa99fc57926b4c8613d5e854196e 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 5/9] 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 c773929c8d..b3ab32ae06 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_eventhub
+type ClusterMemberPut struct {
 	// API extension: clustering_roles
 	Roles []string `json:"roles" yaml:"roles"`
 }

From 76604fa1a78fc1fd00f25a38457a1bce7d00010b 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 6/9] 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 ea2c2d3aa1..530e26565f 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -48,6 +48,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},
 }
 
@@ -853,13 +855,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 17c4d2aca8..199a8a83d7 100644
--- a/lxd/db/node.go
+++ b/lxd/db/node.go
@@ -8,11 +8,12 @@ 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/version"
-	"github.com/pkg/errors"
 )
 
 // ClusterRole represents the role of a member in a cluster.
@@ -379,6 +380,45 @@ func (c *ClusterTx) NodeAddRole(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 c0eb4490ff5c205cd5c3a21dcfbb15104eed71a9 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 7/9] 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 9dd9b7f5cf..fd91b0ffab 100644
--- a/client/interfaces.go
+++ b/client/interfaces.go
@@ -283,6 +283,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..91ecbf79fa 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_eventhub") {
+		return fmt.Errorf("The server is missing the required \"clustering\" 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 e91d84d03a228d99488adf2b22fe208ca7c336c1 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 8/9] 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 c147e54155..a956c8d2f3 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
 }
 
@@ -402,3 +408,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 ffcd362fd7f9dd94e0489870ae51b8e105e2d368 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 9/9] 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      | 188 +++++++++++++++++++++++++++---------------------
 po/de.po      | 194 +++++++++++++++++++++++++++++---------------------
 po/el.po      | 188 +++++++++++++++++++++++++++---------------------
 po/es.po      | 189 +++++++++++++++++++++++++++---------------------
 po/fa.po      | 188 +++++++++++++++++++++++++++---------------------
 po/fi.po      | 188 +++++++++++++++++++++++++++---------------------
 po/fr.po      | 194 +++++++++++++++++++++++++++++---------------------
 po/hi.po      | 188 +++++++++++++++++++++++++++---------------------
 po/id.po      | 188 +++++++++++++++++++++++++++---------------------
 po/it.po      | 189 +++++++++++++++++++++++++++---------------------
 po/ja.po      | 194 +++++++++++++++++++++++++++++---------------------
 po/ko.po      | 188 +++++++++++++++++++++++++++---------------------
 po/lxd.pot    |  86 +++++++++++++---------
 po/nb_NO.po   | 188 +++++++++++++++++++++++++++---------------------
 po/nl.po      | 188 +++++++++++++++++++++++++++---------------------
 po/pa.po      | 188 +++++++++++++++++++++++++++---------------------
 po/pl.po      | 188 +++++++++++++++++++++++++++---------------------
 po/pt_BR.po   | 190 +++++++++++++++++++++++++++---------------------
 po/ru.po      | 193 ++++++++++++++++++++++++++++---------------------
 po/sl.po      | 188 +++++++++++++++++++++++++++---------------------
 po/sr.po      | 188 +++++++++++++++++++++++++++---------------------
 po/sv.po      | 188 +++++++++++++++++++++++++++---------------------
 po/te.po      | 188 +++++++++++++++++++++++++++---------------------
 po/tr.po      | 188 +++++++++++++++++++++++++++---------------------
 po/uk.po      | 188 +++++++++++++++++++++++++++---------------------
 po/zh_Hans.po | 188 +++++++++++++++++++++++++++---------------------
 26 files changed, 2756 insertions(+), 2057 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index efa318ad6d..c0de111c79 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index e4fb3506fc..2898ad478a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2019-09-21 20:27+0000\n"
 "Last-Translator: Joshua Dietz <jospam at dietz-ulm.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -79,6 +79,12 @@ msgstr ""
 "### config:\n"
 "###   size: \"61203283968\""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 #, fuzzy
 msgid ""
@@ -701,7 +707,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -736,9 +742,10 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Config key/value to apply to the target container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, fuzzy, c-format
 msgid "Config parsing error: %s"
 msgstr "YAML Analyse Fehler %v\n"
@@ -940,7 +947,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 ""
 
@@ -1015,53 +1022,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1152,7 +1160,7 @@ msgstr " Prozessorauslastung:"
 msgid "Disks:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1179,6 +1187,11 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+#, fuzzy
+msgid "Edit cluster member configurations as YAML"
+msgstr "Alternatives config Verzeichnis."
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 #, fuzzy
 msgid "Edit container file templates"
@@ -1226,11 +1239,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1379,7 +1392,7 @@ msgstr "Fingerabdruck: %s\n"
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1396,7 +1409,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1420,7 +1433,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1722,7 +1735,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 ""
 
@@ -1754,7 +1767,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 ""
 
@@ -1965,7 +1978,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1987,7 +2000,7 @@ msgstr "Veröffentliche Abbild"
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -2089,12 +2102,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "Gerät %s wurde von %s entfernt\n"
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
@@ -2127,6 +2140,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "der Name des Ursprung Containers muss angegeben werden"
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2257,7 +2275,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2472,8 +2490,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2694,7 +2712,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2721,7 +2739,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2840,7 +2858,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 ""
 
@@ -3029,7 +3047,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3435,7 +3453,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3518,7 +3536,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3657,7 +3675,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3820,6 +3838,14 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3870,7 +3896,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -4048,6 +4074,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4394,7 +4426,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4419,7 +4451,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4539,7 +4571,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4703,7 +4735,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 0af5873060..42e8ffca7d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -50,6 +50,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -555,7 +561,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -587,9 +593,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -775,7 +782,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -846,53 +853,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -977,7 +985,7 @@ msgstr "  Χρήση CPU:"
 msgid "Disks:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1004,6 +1012,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1049,11 +1061,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1191,7 +1203,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1207,7 +1219,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1231,7 +1243,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1523,7 +1535,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 ""
 
@@ -1554,7 +1566,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 ""
 
@@ -1742,7 +1754,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1763,7 +1775,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1855,12 +1867,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1895,6 +1907,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2013,7 +2029,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2224,8 +2240,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2439,7 +2455,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2463,7 +2479,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2754,7 +2770,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3144,7 +3160,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3224,7 +3240,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3351,7 +3367,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3493,6 +3509,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3533,7 +3553,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3647,7 +3667,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3694,6 +3714,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4011,7 +4037,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4031,7 +4057,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4113,7 +4139,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4250,7 +4276,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 7ad4edc1d3..39a0c98c67 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -64,6 +64,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -630,7 +636,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr "Nombre del Miembro del Cluster"
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -662,9 +668,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -856,7 +863,7 @@ msgstr "Creando el contenedor"
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -927,53 +934,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1057,7 +1065,7 @@ msgstr "Uso del disco:"
 msgid "Disks:"
 msgstr "Uso del disco:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1084,6 +1092,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1129,11 +1141,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1274,7 +1286,7 @@ msgstr "Huella dactilar: %s"
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1290,7 +1302,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1314,7 +1326,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1607,7 +1619,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 ""
 
@@ -1639,7 +1651,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 ""
 
@@ -1827,7 +1839,7 @@ msgstr "Cacheado: %s"
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1848,7 +1860,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1940,12 +1952,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1978,6 +1990,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Nombre del Miembro del Cluster"
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2099,7 +2116,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2309,8 +2326,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2524,7 +2541,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2548,7 +2565,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2658,7 +2675,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 ""
 
@@ -2839,7 +2856,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3229,7 +3246,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3309,7 +3326,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3437,7 +3454,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3579,6 +3596,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3620,7 +3641,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3734,7 +3755,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3781,6 +3802,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4098,7 +4125,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4118,7 +4145,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4201,7 +4228,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4340,7 +4367,7 @@ msgstr "Columnas"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 3933fdf6ec..47220081c5 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 0c1da19b70..a66e149295 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 2558c62de8..2dd3b7126b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2019-01-04 18:07+0000\n"
 "Last-Translator: Deleted User <noreply+12102 at weblate.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -74,6 +74,12 @@ msgstr ""
 "### Un exemple serait :\n"
 "###  description: Mon image personnalisée"
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -682,7 +688,7 @@ msgstr "Afficher la version du client"
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -722,9 +728,10 @@ msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 msgid "Config key/value to apply to the target container"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "Erreur lors de la lecture de la configuration : %s"
@@ -944,7 +951,7 @@ msgstr "Création du conteneur"
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -1021,53 +1028,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1153,7 +1161,7 @@ msgstr "  Disque utilisé :"
 msgid "Disks:"
 msgstr "  Disque utilisé :"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 #, fuzzy
 msgid "Don't require user confirmation for using --force"
 msgstr "Requérir une confirmation de l'utilisateur"
@@ -1181,6 +1189,11 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+#, fuzzy
+msgid "Edit cluster member configurations as YAML"
+msgstr "Clé de configuration invalide"
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 #, fuzzy
 msgid "Edit container file templates"
@@ -1229,11 +1242,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1387,7 +1400,7 @@ msgstr "Empreinte : %s"
 msgid "Force pseudo-terminal allocation"
 msgstr "Forcer l'allocation d'un pseudo-terminal"
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1404,7 +1417,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:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1428,7 +1441,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -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 "Alias :"
 
-#: lxc/cluster.go:67 lxc/cluster.go:68
+#: lxc/cluster.go:73 lxc/cluster.go:74
 msgid "List all the cluster members"
 msgstr ""
 
@@ -2019,7 +2032,7 @@ msgstr "Créé : %s"
 msgid "MANAGED"
 msgstr "GÉRÉ"
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -2040,7 +2053,7 @@ msgstr "Rendre l'image publique"
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -2140,12 +2153,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "Profil %s supprimé de %s"
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
@@ -2181,6 +2194,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Vous devez fournir le nom d'un conteneur pour : "
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2313,7 +2331,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2536,8 +2554,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
 
@@ -2758,7 +2776,7 @@ msgstr "Serveur distant : %s"
 msgid "Remove %s (yes/no): "
 msgstr "Supprimer %s (oui/non) : "
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2785,7 +2803,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2904,7 +2922,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"
 
@@ -3099,7 +3117,7 @@ msgstr "Afficher des informations supplémentaires"
 msgid "Show content of container file templates"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3515,7 +3533,7 @@ msgstr "Type : éphémère"
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr "URL"
 
@@ -3603,7 +3621,7 @@ msgstr "Publié : %s"
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 #, fuzzy
 msgid "User aborted delete operation"
 msgstr "L'utilisateur a annulé l'opération de suppression."
@@ -3739,7 +3757,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3906,6 +3924,14 @@ msgstr "désactivé"
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3962,7 +3988,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4097,7 +4123,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -4144,6 +4170,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4520,7 +4552,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4548,7 +4580,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4674,7 +4706,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4850,7 +4882,7 @@ msgstr "Colonnes"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr "oui"
diff --git a/po/hi.po b/po/hi.po
index 5c307fb604..0cdb11409d 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index b36ef48dd5..d1cdfff6ae 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 64107e57c0..023f9ff42e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Luigi Operoso <brokenpip3 at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -65,6 +65,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -593,7 +599,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -625,9 +631,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -817,7 +824,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 ""
 
@@ -888,53 +895,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1018,7 +1026,7 @@ msgstr "Utilizzo disco:"
 msgid "Disks:"
 msgstr "Utilizzo disco:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1045,6 +1053,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1090,11 +1102,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1235,7 +1247,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1251,7 +1263,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1275,7 +1287,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1570,7 +1582,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 ""
 
@@ -1602,7 +1614,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 ""
 
@@ -1791,7 +1803,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1812,7 +1824,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1906,12 +1918,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1944,6 +1956,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Il nome del container è: %s"
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2064,7 +2081,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2275,8 +2292,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2490,7 +2507,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2514,7 +2531,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2625,7 +2642,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 ""
 
@@ -2806,7 +2823,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3199,7 +3216,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3280,7 +3297,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3409,7 +3426,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3551,6 +3568,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3592,7 +3613,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3706,7 +3727,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3753,6 +3774,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4070,7 +4097,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4090,7 +4117,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4173,7 +4200,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4312,7 +4339,7 @@ msgstr "Colonne"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr "si"
diff --git a/po/ja.po b/po/ja.po
index e6f24f9430..f5392dba95 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2019-09-20 11:43+0000\n"
 "Last-Translator: Hiroaki Nakamura <hnakamur at gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -50,6 +50,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -570,7 +576,7 @@ msgstr "クライアントバージョン: %s\n"
 msgid "Cluster member name"
 msgstr "クラスタメンバ名"
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr "クラスタリングが有効になりました"
 
@@ -606,9 +612,10 @@ msgstr "新しいプロジェクトに適用するキー/値の設定"
 msgid "Config key/value to apply to the target container"
 msgstr "移動先のコンテナに適用するキー/値の設定"
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "設定の構文エラー: %s"
@@ -807,7 +814,7 @@ msgstr "コンテナを作成中"
 msgid "Current number of VFs: %d"
 msgstr "現在の VF 数: %d"
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -879,53 +886,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr "説明"
 
@@ -1011,7 +1019,7 @@ msgstr "ディスク:"
 msgid "Disks:"
 msgstr "ディスク:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr "--force を使う際にユーザーの確認を必要としない"
 
@@ -1040,6 +1048,11 @@ msgstr ""
 "ファイル転送のサーバ側の初期処理はキャンセルできません(強制的に中断するには"
 "あと2回行ってください)"
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+#, fuzzy
+msgid "Edit cluster member configurations as YAML"
+msgstr "ストレージボリュームの設定をYAMLで編集します"
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr "コンテナのファイルテンプレートを編集します"
@@ -1086,12 +1099,12 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 "'%s' 中のカラムエントリが空です (カラムの指定に空文字列が指定されています)"
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 "クラスタリングで動作していないLXDインスタンス上でクラスタリングを有効にします"
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1253,7 +1266,7 @@ msgstr "証明書のフィンガープリント: %s"
 msgid "Force pseudo-terminal allocation"
 msgstr "強制的に擬似端末を割り当てます"
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr "degraded 状態であっても強制的にメンバを削除します"
 
@@ -1269,7 +1282,7 @@ msgstr "稼働中のコンテナを強制的に削除します"
 msgid "Force using the local unix socket"
 msgstr "強制的にローカルのUNIXソケットを使います"
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1308,7 +1321,7 @@ msgstr ""
 "\n"
 "本当に強制的に %s を削除してもよろしいですか? (yes/no):"
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1609,7 +1622,7 @@ msgstr ""
 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 サーバはクラスタの一部ではありません"
 
@@ -1640,7 +1653,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 "クラスタのメンバをすべて一覧表示します"
 
@@ -1917,7 +1930,7 @@ msgstr "MAD: %s (%s)"
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1938,7 +1951,7 @@ msgstr "イメージを public にする"
 msgid "Manage and attach containers to networks"
 msgstr "ネットワークを管理し、コンテナをネットワークに接続します"
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr "クラスタのメンバを管理します"
 
@@ -2047,12 +2060,12 @@ msgstr "信頼済みのクライアントを管理します"
 msgid "Maximum number of VFs: %d"
 msgstr "VF の最大数: %d"
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr "メンバ %s が削除されました"
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr "メンバ名 %s を %s に変更しました"
@@ -2085,6 +2098,11 @@ msgstr "マイグレーションが失敗しました"
 msgid "Minimum level for log messages"
 msgstr "表示するログメッセージの最小レベル"
 
+#: lxc/cluster.go:455
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "クラスタメンバ名"
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2210,7 +2228,7 @@ msgstr "ディレクトリからのインポートは root で実行する必要
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2420,8 +2438,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr "再度エディタを開くためには Enter キーを押します"
 
@@ -2635,7 +2653,7 @@ msgstr "リムーバブルディスク: %v"
 msgid "Remove %s (yes/no): "
 msgstr "%s を消去しますか (yes/no): "
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr "クラスタからメンバを削除します"
 
@@ -2659,7 +2677,7 @@ msgstr "リモートサーバを削除します"
 msgid "Remove trusted clients"
 msgstr "信頼済みクライアントを削除します"
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr "クラスタメンバの名前を変更します"
 
@@ -2776,7 +2794,7 @@ msgstr ""
 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 ""
 
@@ -2993,7 +3011,7 @@ msgstr "コンテナもしくはサーバの情報を表示します"
 msgid "Show content of container file templates"
 msgstr "コンテナのファイルテンプレートの内容を表示します"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr "クラスタメンバの詳細を表示します"
 
@@ -3406,7 +3424,7 @@ msgstr "タイプ: ephemeral"
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3488,7 +3506,7 @@ msgstr "使用済: %v"
 msgid "User ID to run the command as (default 0)"
 msgstr "コマンドを実行する際のユーザ ID (UID) (デフォルト 0)"
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr "ユーザが削除操作を中断しました"
 
@@ -3620,7 +3638,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3765,6 +3783,11 @@ msgstr "無効"
 msgid "driver"
 msgstr "ドライバ"
 
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr "get [<remote>:]<project> <key>"
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3805,7 +3828,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr "edit [<remote>:][<container>[/<snapshot>]]"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3921,7 +3944,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3974,6 +3997,15 @@ msgstr ""
 "lxc alias rename list my-list\n"
 "    エイリアス名 \"list\" を \"my-list\" に変更します。"
 
+#: lxc/cluster.go:424
+#, 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>:]container1 <device-name> disk source=/share/"
@@ -4406,7 +4438,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4426,7 +4458,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4510,7 +4542,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4647,7 +4679,7 @@ msgstr "volume"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 32c2dc4184..4324ac42c0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/lxd.pot b/po/lxd.pot
index a67769291d..9211bd6949 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2019-11-07 16:26+0000\n"
+        "POT-Creation-Date: 2019-11-10 18:28-0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,6 +45,11 @@ msgid   "### This is a yaml representation of a storage volume.\n"
         "###   size: \"61203283968\""
 msgstr  ""
 
+#: lxc/cluster.go:434
+msgid   "### This is a yaml representation of the cluster member.\n"
+        "### Any line starting with a '# will be ignored."
+msgstr  ""
+
 #: lxc/config.go:103
 msgid   "### This is a yaml representation of the configuration.\n"
         "### Any line starting with a '# will be ignored.\n"
@@ -528,7 +533,7 @@ msgstr  ""
 msgid   "Cluster member name"
 msgstr  ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid   "Clustering enabled"
 msgstr  ""
 
@@ -559,7 +564,7 @@ msgstr  ""
 msgid   "Config key/value to apply to the target container"
 msgstr  ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid   "Config parsing error: %s"
 msgstr  ""
@@ -742,7 +747,7 @@ msgstr  ""
 msgid   "Current number of VFs: %d"
 msgstr  ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid   "DATABASE"
 msgstr  ""
 
@@ -810,7 +815,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:146 lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1286 lxc/storage_volume.go:1362 lxc/storage_volume.go:1461 lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152 lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1286 lxc/storage_volume.go:1362 lxc/storage_volume.go:1461 lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -892,7 +897,7 @@ msgstr  ""
 msgid   "Disks:"
 msgstr  ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid   "Don't require user confirmation for using --force"
 msgstr  ""
 
@@ -917,6 +922,10 @@ msgstr  ""
 msgid   "Early server side processing of file tranfer requests cannot be canceled (interrupt two more times to force)"
 msgstr  ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid   "Edit cluster member configurations as YAML"
+msgstr  ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid   "Edit container file templates"
 msgstr  ""
@@ -962,11 +971,11 @@ msgstr  ""
 msgid   "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr  ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid   "Enable clustering on a single non-clustered LXD instance"
 msgstr  ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid   "Enable clustering on a single non-clustered LXD instance\n"
         "\n"
         "  This command turns a non-clustered LXD instance into the first member of a new\n"
@@ -1096,7 +1105,7 @@ msgstr  ""
 msgid   "Force pseudo-terminal allocation"
 msgstr  ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid   "Force removing a member, even if degraded"
 msgstr  ""
 
@@ -1112,7 +1121,7 @@ msgstr  ""
 msgid   "Force using the local unix socket"
 msgstr  ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid   "Forcefully removing a server from the cluster should only be done as a last\n"
         "resort.\n"
@@ -1131,7 +1140,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:239 lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510 lxc/storage_volume.go:1071
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239 lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510 lxc/storage_volume.go:1071
 msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
@@ -1414,7 +1423,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  ""
 
@@ -1445,7 +1454,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  ""
 
@@ -1625,7 +1634,7 @@ msgstr  ""
 msgid   "MANAGED"
 msgstr  ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid   "MESSAGE"
 msgstr  ""
 
@@ -1646,7 +1655,7 @@ msgstr  ""
 msgid   "Manage and attach containers to networks"
 msgstr  ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid   "Manage cluster members"
 msgstr  ""
 
@@ -1735,12 +1744,12 @@ msgstr  ""
 msgid   "Maximum number of VFs: %d"
 msgstr  ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid   "Member %s removed"
 msgstr  ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid   "Member %s renamed to %s"
 msgstr  ""
@@ -1773,6 +1782,10 @@ msgstr  ""
 msgid   "Minimum level for log messages"
 msgstr  ""
 
+#: lxc/cluster.go:455
+msgid   "Missing cluster member name"
+msgstr  ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199 lxc/config_template.go:90 lxc/config_template.go:133 lxc/config_template.go:175 lxc/config_template.go:262 lxc/config_template.go:320 lxc/profile.go:198 lxc/profile.go:660
 msgid   "Missing container name"
 msgstr  ""
@@ -1870,7 +1883,7 @@ msgstr  ""
 msgid   "Must supply container name for: "
 msgstr  ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620 lxc/project.go:449 lxc/remote.go:513 lxc/storage.go:558 lxc/storage_volume.go:1118
+#: lxc/cluster.go:132 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620 lxc/project.go:449 lxc/remote.go:513 lxc/storage.go:558 lxc/storage_volume.go:1118
 msgid   "NAME"
 msgstr  ""
 
@@ -2077,7 +2090,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305 lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid   "Press enter to open the editor again"
 msgstr  ""
 
@@ -2289,7 +2302,7 @@ msgstr  ""
 msgid   "Remove %s (yes/no): "
 msgstr  ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid   "Remove a member from the cluster"
 msgstr  ""
 
@@ -2313,7 +2326,7 @@ msgstr  ""
 msgid   "Remove trusted clients"
 msgstr  ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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  ""
 
@@ -2585,7 +2598,7 @@ msgstr  ""
 msgid   "Show content of container file templates"
 msgstr  ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid   "Show details of a cluster member"
 msgstr  ""
 
@@ -2965,7 +2978,7 @@ msgstr  ""
 msgid   "UPLOAD DATE"
 msgstr  ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid   "URL"
 msgstr  ""
 
@@ -3043,7 +3056,7 @@ msgstr  ""
 msgid   "User ID to run the command as (default 0)"
 msgstr  ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid   "User aborted delete operation"
 msgstr  ""
 
@@ -3160,7 +3173,7 @@ msgstr  ""
 msgid   "attach-profile [<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr  ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid   "cluster"
 msgstr  ""
 
@@ -3300,6 +3313,10 @@ msgstr  ""
 msgid   "driver"
 msgstr  ""
 
+#: lxc/cluster.go:420
+msgid   "edit [<remote>:]<cluster member>"
+msgstr  ""
+
 #: lxc/config_metadata.go:51
 msgid   "edit [<remote>:]<container>"
 msgstr  ""
@@ -3340,7 +3357,7 @@ msgstr  ""
 msgid   "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr  ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid   "enable [<remote>:] <name>"
 msgstr  ""
 
@@ -3450,7 +3467,7 @@ msgstr  ""
 msgid   "list"
 msgstr  ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 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:113 lxc/network.go:804 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid   "list [<remote>:]"
 msgstr  ""
 
@@ -3493,6 +3510,11 @@ msgid   "lxc alias rename list my-list\n"
         "    Rename existing alias \"list\" to \"my-list\"."
 msgstr  ""
 
+#: lxc/cluster.go:424
+msgid   "lxc cluster edit <cluster member> < member.yaml\n"
+        "    Update a cluster member using the content of member.yaml"
+msgstr  ""
+
 #: lxc/config_device.go:79
 msgid   "lxc config device add [<remote>:]container1 <device-name> disk source=/share/c1 path=opt\n"
         "    Will mount the host's /share/c1 onto /opt in the container."
@@ -3767,7 +3789,7 @@ msgstr  ""
 msgid   "remove [<remote>:]<container|profile> <name>..."
 msgstr  ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid   "remove [<remote>:]<member>"
 msgstr  ""
 
@@ -3787,7 +3809,7 @@ msgstr  ""
 msgid   "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr  ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid   "rename [<remote>:]<member> <new-name>"
 msgstr  ""
 
@@ -3867,7 +3889,7 @@ msgstr  ""
 msgid   "show [<remote>:]<image>"
 msgstr  ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid   "show [<remote>:]<member>"
 msgstr  ""
 
@@ -4004,7 +4026,7 @@ msgstr  ""
 msgid   "y"
 msgstr  ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854 lxc/image.go:1028
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854 lxc/image.go:1028
 msgid   "yes"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 1c9c6c1329..133927869d 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e36ce5bd7c..5c770f0c48 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -73,6 +73,12 @@ msgstr ""
 "### config:\n"
 "###  size: \"61203283968\""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -600,7 +606,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -632,9 +638,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -820,7 +827,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -891,53 +898,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1019,7 +1027,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1046,6 +1054,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1091,11 +1103,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1233,7 +1245,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1249,7 +1261,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1273,7 +1285,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1565,7 +1577,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 ""
 
@@ -1596,7 +1608,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 ""
 
@@ -1784,7 +1796,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1805,7 +1817,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1897,12 +1909,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1935,6 +1947,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2053,7 +2069,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2263,8 +2279,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2478,7 +2494,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2502,7 +2518,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2612,7 +2628,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 ""
 
@@ -2793,7 +2809,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3183,7 +3199,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3263,7 +3279,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3390,7 +3406,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3532,6 +3548,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3572,7 +3592,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3686,7 +3706,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3733,6 +3753,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4050,7 +4076,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4070,7 +4096,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4152,7 +4178,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4289,7 +4315,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 9cea55344b..b6af6fea19 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 1b17ee8231..bd31141334 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2018-09-08 19:22+0000\n"
 "Last-Translator: m4sk1n <me at m4sk.in>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/linux-containers/"
@@ -61,6 +61,12 @@ msgstr ""
 "### config:\n"
 "###   size: \"61203283968\""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -600,7 +606,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -632,9 +638,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -820,7 +827,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -891,53 +898,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1019,7 +1027,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1046,6 +1054,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1091,11 +1103,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1233,7 +1245,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1249,7 +1261,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1273,7 +1285,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1565,7 +1577,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 ""
 
@@ -1596,7 +1608,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 ""
 
@@ -1784,7 +1796,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1805,7 +1817,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1897,12 +1909,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1935,6 +1947,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2053,7 +2069,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2263,8 +2279,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2478,7 +2494,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2502,7 +2518,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2612,7 +2628,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 ""
 
@@ -2793,7 +2809,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3183,7 +3199,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3263,7 +3279,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3390,7 +3406,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3532,6 +3548,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3572,7 +3592,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3686,7 +3706,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3733,6 +3753,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4050,7 +4076,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4070,7 +4096,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4152,7 +4178,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4289,7 +4315,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 42defdcd3e..bb13943195 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -75,6 +75,12 @@ msgstr ""
 "### config:\n"
 "###   size: \"61203283968\""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -675,7 +681,7 @@ msgstr "Versão do cliente: %s\n"
 msgid "Cluster member name"
 msgstr "Nome de membro do cluster"
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr "Clustering ativado"
 
@@ -712,9 +718,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "Erro de análise de configuração: %s"
@@ -907,7 +914,7 @@ msgstr "Criando %s"
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -979,53 +986,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr "Descrição"
 
@@ -1109,7 +1117,7 @@ msgstr "Uso de disco:"
 msgid "Disks:"
 msgstr "Uso de disco:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1136,6 +1144,11 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+#, fuzzy
+msgid "Edit cluster member configurations as YAML"
+msgstr "Editar configurações do container ou do servidor como YAML"
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr "Editar templates de arquivo do container"
@@ -1182,11 +1195,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1324,7 +1337,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr "Forçar alocação de pseudo-terminal"
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1340,7 +1353,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1364,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1657,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 ""
 
@@ -1688,7 +1701,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 ""
 
@@ -1876,7 +1889,7 @@ msgstr "Em cache: %s"
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1897,7 +1910,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1989,12 +2002,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2027,6 +2040,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Nome de membro do cluster"
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2145,7 +2163,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2355,8 +2373,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2570,7 +2588,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2594,7 +2612,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2704,7 +2722,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 ""
 
@@ -2886,7 +2904,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3276,7 +3294,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3357,7 +3375,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3484,7 +3502,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3626,6 +3644,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3666,7 +3688,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3780,7 +3802,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3827,6 +3849,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4144,7 +4172,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4164,7 +4192,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4246,7 +4274,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4383,7 +4411,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr "sim"
diff --git a/po/ru.po b/po/ru.po
index 45415a9530..eff4d27850 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2018-06-22 15:57+0000\n"
 "Last-Translator: Александр Киль <shorrey at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -65,6 +65,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -666,7 +672,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -698,9 +704,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -896,7 +903,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -970,53 +977,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1101,7 +1109,7 @@ msgstr " Использование диска:"
 msgid "Disks:"
 msgstr " Использование диска:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1128,6 +1136,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 #, fuzzy
 msgid "Edit container file templates"
@@ -1174,11 +1186,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1319,7 +1331,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1335,7 +1347,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1359,7 +1371,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1654,7 +1666,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 ""
 
@@ -1686,7 +1698,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 ""
 
@@ -1876,7 +1888,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1897,7 +1909,7 @@ msgstr ""
 msgid "Manage and attach containers 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:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2032,6 +2044,11 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+#, fuzzy
+msgid "Missing cluster member name"
+msgstr "Имя контейнера: %s"
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2154,7 +2171,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2366,8 +2383,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2582,7 +2599,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2607,7 +2624,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2721,7 +2738,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 ""
 
@@ -2904,7 +2921,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3297,7 +3314,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3377,7 +3394,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3505,7 +3522,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3667,6 +3684,14 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+#, fuzzy
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3715,7 +3740,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3845,7 +3870,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3892,6 +3917,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4229,7 +4260,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4253,7 +4284,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4371,7 +4402,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4533,7 +4564,7 @@ msgstr "Столбцы"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr "да"
diff --git a/po/sl.po b/po/sl.po
index a5b9c36955..18bb3affde 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 0d85d28e05..39ad53c44e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 0bfa273b1b..b3f09fe136 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index ef1cf9ca3c..2adda091b4 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 5a3a631218..463cd36217 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index bb86511931..bed213beab 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,6 +47,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -551,7 +557,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,9 +589,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -842,53 +849,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -970,7 +978,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -997,6 +1005,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1042,11 +1054,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1200,7 +1212,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1224,7 +1236,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -1516,7 +1528,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 ""
 
@@ -1547,7 +1559,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 ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:130
+#: lxc/cluster.go:136
 msgid "MESSAGE"
 msgstr ""
 
@@ -1756,7 +1768,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:28 lxc/cluster.go:29
+#: lxc/cluster.go:30 lxc/cluster.go:31
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1848,12 +1860,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1886,6 +1898,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2004,7 +2020,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2214,8 +2230,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2429,7 +2445,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2744,7 +2760,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3134,7 +3150,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3214,7 +3230,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3341,7 +3357,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3483,6 +3499,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3523,7 +3543,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3637,7 +3657,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3684,6 +3704,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4001,7 +4027,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4021,7 +4047,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4103,7 +4129,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4240,7 +4266,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index 0030609710..d1788f354b 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-11-07 16:23+0000\n"
+"POT-Creation-Date: 2019-11-10 18:28-0500\n"
 "PO-Revision-Date: 2018-09-11 19:15+0000\n"
 "Last-Translator: 0x0916 <w at laoqinren.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -50,6 +50,12 @@ msgid ""
 "###   size: \"61203283968\""
 msgstr ""
 
+#: lxc/cluster.go:434
+msgid ""
+"### This is a yaml representation of the cluster member.\n"
+"### Any line starting with a '# will be ignored."
+msgstr ""
+
 #: lxc/config.go:103
 msgid ""
 "### This is a yaml representation of the configuration.\n"
@@ -554,7 +560,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:408
 msgid "Clustering enabled"
 msgstr ""
 
@@ -586,9 +592,10 @@ msgstr ""
 msgid "Config key/value to apply to the target container"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
-#: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
-#: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/cluster.go:503 lxc/config.go:270 lxc/config.go:343
+#: lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640
+#: lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303
+#: lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
@@ -774,7 +781,7 @@ msgstr ""
 msgid "Current number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:128
+#: lxc/cluster.go:134
 msgid "DATABASE"
 msgstr ""
 
@@ -845,53 +852,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:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
-#: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
-#: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
-#: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
-#: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
-#: lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41
-#: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
-#: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
-#: lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:592
-#: lxc/image.go:808 lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311
-#: lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105
-#: lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28
-#: lxc/info.go:32 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50
-#: lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32
-#: lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326
-#: lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669
-#: lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961
-#: lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143
-#: lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102
-#: lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164
-#: lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404
-#: lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712
-#: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
-#: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
-#: lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584
-#: lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
-#: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139
-#: lxc/storage_volume.go:218 lxc/storage_volume.go:301
-#: lxc/storage_volume.go:462 lxc/storage_volume.go:539
-#: lxc/storage_volume.go:615 lxc/storage_volume.go:697
-#: lxc/storage_volume.go:778 lxc/storage_volume.go:978
-#: lxc/storage_volume.go:1069 lxc/storage_volume.go:1142
-#: lxc/storage_volume.go:1173 lxc/storage_volume.go:1286
-#: lxc/storage_volume.go:1362 lxc/storage_volume.go:1461
-#: lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:152
+#: lxc/cluster.go:202 lxc/cluster.go:252 lxc/cluster.go:337 lxc/cluster.go:422
+#: lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454
+#: lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24
+#: lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261
+#: lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507
+#: lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681
+#: lxc/config_metadata.go:28 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:175 lxc/config_template.go:29
+#: lxc/config_template.go:66 lxc/config_template.go:109
+#: lxc/config_template.go:151 lxc/config_template.go:237
+#: lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58
+#: lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32
+#: lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270
+#: lxc/image.go:321 lxc/image.go:446 lxc/image.go:592 lxc/image.go:808
+#: lxc/image.go:934 lxc/image.go:1232 lxc/image.go:1311 lxc/image_alias.go:25
+#: lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150
+#: lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:32 lxc/init.go:40
+#: lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19
+#: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108
+#: lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376
+#: lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727
+#: lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011
+#: lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24
+#: lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181
+#: lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244
+#: lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528
+#: lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762
+#: lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86
+#: lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384
+#: lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613
+#: lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34
+#: lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535
+#: lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21
+#: lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218
+#: lxc/storage_volume.go:301 lxc/storage_volume.go:462
+#: lxc/storage_volume.go:539 lxc/storage_volume.go:615
+#: lxc/storage_volume.go:697 lxc/storage_volume.go:778
+#: lxc/storage_volume.go:978 lxc/storage_volume.go:1069
+#: lxc/storage_volume.go:1142 lxc/storage_volume.go:1173
+#: lxc/storage_volume.go:1286 lxc/storage_volume.go:1362
+#: lxc/storage_volume.go:1461 lxc/storage_volume.go:1492
+#: lxc/storage_volume.go:1563 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -973,7 +981,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:257
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1000,6 +1008,10 @@ msgid ""
 "(interrupt two more times to force)"
 msgstr ""
 
+#: lxc/cluster.go:421 lxc/cluster.go:422
+msgid "Edit cluster member configurations as YAML"
+msgstr ""
+
 #: lxc/config_template.go:150 lxc/config_template.go:151
 msgid "Edit container file templates"
 msgstr ""
@@ -1045,11 +1057,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:336
 msgid "Enable clustering on a single non-clustered LXD instance"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:337
 msgid ""
 "Enable clustering on a single non-clustered LXD instance\n"
 "\n"
@@ -1187,7 +1199,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:256
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1203,7 +1215,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:264
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1227,7 +1239,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:239
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:239
 #: lxc/config_trust.go:118 lxc/image.go:960 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:459 lxc/storage.go:510
@@ -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 containers 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:313
+#: lxc/cluster.go:319
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:232
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1889,6 +1901,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
+#: lxc/cluster.go:455
+msgid "Missing cluster member name"
+msgstr ""
+
 #: lxc/config_metadata.go:101 lxc/config_metadata.go:199
 #: lxc/config_template.go:90 lxc/config_template.go:133
 #: lxc/config_template.go:175 lxc/config_template.go:262
@@ -2007,7 +2023,7 @@ msgstr ""
 msgid "Must supply container 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:449 lxc/remote.go:513 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
@@ -2217,8 +2233,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:918 lxc/storage_volume.go:948
+#: lxc/cluster.go:504 lxc/network.go:641 lxc/profile.go:499 lxc/project.go:305
+#: lxc/storage.go:304 lxc/storage_volume.go:918 lxc/storage_volume.go:948
 msgid "Press enter to open the editor again"
 msgstr ""
 
@@ -2432,7 +2448,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:251 lxc/cluster.go:252
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2456,7 +2472,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:201 lxc/cluster.go:202
 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 ""
 
@@ -2747,7 +2763,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:151 lxc/cluster.go:152
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3137,7 +3153,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:133 lxc/remote.go:514
 msgid "URL"
 msgstr ""
 
@@ -3217,7 +3233,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:283 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3344,7 +3360,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:27
+#: lxc/cluster.go:29
 msgid "cluster"
 msgstr ""
 
@@ -3486,6 +3502,10 @@ msgstr ""
 msgid "driver"
 msgstr ""
 
+#: lxc/cluster.go:420
+msgid "edit [<remote>:]<cluster member>"
+msgstr ""
+
 #: lxc/config_metadata.go:51
 msgid "edit [<remote>:]<container>"
 msgstr ""
@@ -3526,7 +3546,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:335
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3640,7 +3660,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:71 lxc/config_trust.go:113 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3687,6 +3707,12 @@ msgid ""
 "    Rename existing alias \"list\" to \"my-list\"."
 msgstr ""
 
+#: lxc/cluster.go:424
+msgid ""
+"lxc cluster edit <cluster member> < member.yaml\n"
+"    Update a cluster member using the content of member.yaml"
+msgstr ""
+
 #: lxc/config_device.go:79
 msgid ""
 "lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
@@ -4004,7 +4030,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:249
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4024,7 +4050,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:199
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4106,7 +4132,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:150
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4243,7 +4269,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
+#: lxc/cluster.go:282 lxc/delete.go:46 lxc/image.go:849 lxc/image.go:854
 #: lxc/image.go:1028
 msgid "yes"
 msgstr ""


More information about the lxc-devel mailing list