[lxc-devel] [lxd/master] Add "lxc cluster enable" command

freeekanayaka on Github lxc-bot at linuxcontainers.org
Wed Apr 18 10:37:58 UTC 2018


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 391 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180418/b2804fbb/attachment.bin>
-------------- next part --------------
From 3ddfb8b9bbe83bdfd87ad8bbb761786410eb49a2 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanayaka at canonical.com>
Date: Wed, 18 Apr 2018 10:28:25 +0000
Subject: [PATCH 1/2] Add lxc cluster enable command

Signed-off-by: Free Ekanayaka <free.ekanayaka at canonical.com>
---
 lxc/cluster.go            | 90 +++++++++++++++++++++++++++++++++++++++++++++++
 test/main.sh              |  1 +
 test/suites/clustering.sh | 12 +++++++
 3 files changed, 103 insertions(+)

diff --git a/lxc/cluster.go b/lxc/cluster.go
index da3e50b6b..8966cd5fa 100644
--- a/lxc/cluster.go
+++ b/lxc/cluster.go
@@ -6,6 +6,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	yaml "gopkg.in/yaml.v2"
 
@@ -42,6 +43,10 @@ func (c *cmdCluster) Command() *cobra.Command {
 	clusterShowCmd := cmdClusterShow{global: c.global, cluster: c}
 	cmd.AddCommand(clusterShowCmd.Command())
 
+	// Enable
+	clusterEnableCmd := cmdClusterEnable{global: c.global, cluster: c}
+	cmd.AddCommand(clusterEnableCmd.Command())
+
 	return cmd
 }
 
@@ -268,3 +273,88 @@ func (c *cmdClusterRemove) Run(cmd *cobra.Command, args []string) error {
 	fmt.Printf(i18n.G("Member %s removed")+"\n", resource.name)
 	return nil
 }
+
+// Enable
+type cmdClusterEnable struct {
+	global  *cmdGlobal
+	cluster *cmdCluster
+
+	flagForce bool
+}
+
+func (c *cmdClusterEnable) Command() *cobra.Command {
+	cmd := &cobra.Command{}
+	cmd.Use = i18n.G("enable [<remote>:] <name>")
+	cmd.Aliases = []string{"rm"}
+	cmd.Short = i18n.G("Enable clustering on a single non-clustered LXD instance")
+	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
+		`Enable clustering on a single non-clustered LXD instance
+
+This command turns a non-clustered LXD instance into the first node of a new
+LXD cluster, which will have the given name.
+
+It's required that the LXD is already available on the network. You can check
+that by running 'lxc config get core.https_address', and possibly set a value
+for the address if not yet set.`))
+
+	cmd.RunE = c.Run
+
+	return cmd
+}
+
+func (c *cmdClusterEnable) Run(cmd *cobra.Command, args []string) error {
+	// Sanity checks
+	exit, err := c.global.CheckArgs(cmd, args, 1, 2)
+	if exit {
+		return err
+	}
+
+	// Parse remote
+	remote := ""
+	name := args[0]
+	if len(args) == 2 {
+		remote = args[0]
+		name = args[1]
+	}
+
+	resources, err := c.global.ParseServers(remote)
+	if err != nil {
+		return err
+	}
+
+	resource := resources[0]
+
+	// Check if the LXD instance is available on the network.
+	server, _, err := resource.server.GetServer()
+	if err != nil {
+		return errors.Wrap(err, "Failed to retrieve current server config")
+	}
+	if server.Config["core.https_address"] == "" {
+		return fmt.Errorf("This LXD instance is not available on the network")
+	}
+
+	// Check if already enabled
+	currentCluster, etag, err := resource.server.GetCluster()
+	if err != nil {
+		return errors.Wrap(err, "Failed to retrieve current cluster config")
+	}
+	if currentCluster.Enabled {
+		return fmt.Errorf("This LXD instance is already clustered")
+	}
+
+	// Enable clustering.
+	req := api.ClusterPut{}
+	req.ServerName = name
+	req.Enabled = true
+	op, err := resource.server.UpdateCluster(req, etag)
+	if err != nil {
+		return errors.Wrap(err, "Failed to configure cluster")
+	}
+	err = op.Wait()
+	if err != nil {
+		return errors.Wrap(err, "Failed to configure cluster")
+	}
+
+	fmt.Printf(i18n.G("Clustering enabled") + "\n")
+	return nil
+}
diff --git a/test/main.sh b/test/main.sh
index be52c3b9e..f2eb2dfb5 100755
--- a/test/main.sh
+++ b/test/main.sh
@@ -204,6 +204,7 @@ run_test test_clustering_containers "clustering containers"
 run_test test_clustering_storage "clustering storage"
 run_test test_clustering_network "clustering network"
 #run_test test_clustering_upgrade "clustering upgrade"
+run_test test_clustering_enable "clustering enable"
 
 # shellcheck disable=SC2034
 TEST_RESULT=success
diff --git a/test/suites/clustering.sh b/test/suites/clustering.sh
index 7ff994672..3a1d38448 100644
--- a/test/suites/clustering.sh
+++ b/test/suites/clustering.sh
@@ -649,3 +649,15 @@ test_clustering_upgrade() {
   teardown_clustering_netns
   teardown_clustering_bridge
 }
+
+test_clustering_enable() {
+  # A node name is required.
+  ! lxc cluster enable
+
+  # Enable clustering.
+  lxc cluster enable node1
+  lxc cluster list | grep -q node1
+
+  # Clustering can't be enabled on an already clustered instance.
+  ! lxc cluster enable node2
+}

From 1504be1f785d3a120f5dee0b924ce51694bde8f9 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanayaka at canonical.com>
Date: Wed, 18 Apr 2018 10:30:12 +0000
Subject: [PATCH 2/2] Update .pot files

Signed-off-by: Free Ekanayaka <free.ekanayaka at canonical.com>
---
 po/de.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/el.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/es.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/fa.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/fi.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/fr.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/hi.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/id.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/it.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/ja.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/lxd.pot    | 111 +++++++++++++++++++++++++++++--------------------
 po/nb_NO.po   | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/nl.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/pa.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/pl.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/pt_BR.po   | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/ru.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/sr.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/sv.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/tr.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/uk.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/zh.po      | 131 +++++++++++++++++++++++++++++++++++-----------------------
 po/zh_Hans.po | 131 +++++++++++++++++++++++++++++++++++-----------------------
 23 files changed, 1805 insertions(+), 1188 deletions(-)

diff --git a/po/de.po b/po/de.po
index c6b75812c..d1c8a245f 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: 2017-02-14 17:11+0000\n"
 "Last-Translator: Tim Rose <tim at netlope.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -255,7 +255,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -265,7 +265,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -298,7 +298,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr "Akzeptiere Zertifikat"
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -467,7 +467,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -493,7 +493,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -527,6 +527,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -638,7 +642,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -704,7 +708,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -766,20 +770,20 @@ msgstr "Kein Zertifikat für diese Verbindung"
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -794,7 +798,7 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -915,6 +919,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -1003,7 +1026,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1028,7 +1051,7 @@ msgstr "Fingerabdruck: %s\n"
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1158,7 +1181,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1227,7 +1250,7 @@ msgstr "Ungültiges Ziel %s"
 msgid "Invalid source %s"
 msgstr "Ungültige Quelle %s"
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr "Ungültiges Ziel %s"
@@ -1252,7 +1275,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1274,7 +1297,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Aliasse:\n"
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1457,7 +1480,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1474,7 +1497,7 @@ msgstr "Veröffentliche Abbild"
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1566,12 +1589,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "Gerät %s wurde von %s entfernt\n"
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
@@ -1644,7 +1667,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1698,7 +1721,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1857,7 +1880,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1944,12 +1967,12 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Pull files from containers"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 #, fuzzy
 msgid "Push files into containers"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2001,7 +2024,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2028,7 +2051,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2123,7 +2146,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -2139,7 +2162,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -2201,15 +2224,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr "Setzt die gid der Datei beim Übertragen"
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr "Setzt die Dateiberechtigungen beim Übertragen"
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr "Setzt die uid der Datei beim Übertragen"
 
@@ -2239,7 +2262,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2550,7 +2573,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2569,7 +2592,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, fuzzy, c-format
 msgid "Unknown file type '%s'"
 msgstr "Unbekannter Befehl %s für Abbild"
@@ -2614,7 +2637,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2706,7 +2729,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2889,6 +2912,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2976,7 +3003,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -3055,7 +3082,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3154,7 +3181,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3285,7 +3312,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 #, fuzzy
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
@@ -3295,7 +3322,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3331,7 +3358,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3356,7 +3383,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3432,7 +3459,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index b05ae2219..f61aa933f 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\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/"
@@ -151,7 +151,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -161,7 +161,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -354,7 +354,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -380,7 +380,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -414,6 +414,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -521,7 +525,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -579,7 +583,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -638,20 +642,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -666,7 +670,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -785,6 +789,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -868,7 +891,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -890,7 +913,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1017,7 +1040,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1084,7 +1107,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1109,7 +1132,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1130,7 +1153,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1294,7 +1317,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1310,7 +1333,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1393,12 +1416,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1467,7 +1490,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1516,7 +1539,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1672,7 +1695,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1755,11 +1778,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1810,7 +1833,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1834,7 +1857,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1923,7 +1946,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1939,7 +1962,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1996,15 +2019,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2032,7 +2055,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2328,7 +2351,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2347,7 +2370,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2391,7 +2414,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2477,7 +2500,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2647,6 +2670,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2734,7 +2761,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2813,7 +2840,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2908,7 +2935,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3022,13 +3049,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3060,7 +3087,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3080,7 +3107,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3152,7 +3179,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 4596d68c2..19f1dea9f 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: 2018-02-10 11:39+0000\n"
 "Last-Translator: Allan Esquivel Sibaja <allan.esquivel.sibaja at gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -208,7 +208,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s no es un directorio"
@@ -218,7 +218,7 @@ msgstr "%s no es un directorio"
 msgid "%v (interrupt two more times to force)"
 msgstr "%v (interrumpe dos o más tiempos a la fuerza)"
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr "%s no es un tipo de archivo soportado."
@@ -251,7 +251,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr "Acepta certificado"
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr "Accion (predeterminados a GET)"
 
@@ -411,7 +411,7 @@ msgstr "Cacheado: %s"
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr "No se puede jalar un directorio sin - recursivo"
 
@@ -437,7 +437,7 @@ msgstr "No se puede especificar un remote diferente para renombrar."
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -471,6 +471,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "Columnas"
@@ -578,7 +582,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -637,7 +641,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -696,20 +700,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -724,7 +728,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -842,6 +846,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -925,7 +948,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -947,7 +970,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1074,7 +1097,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1141,7 +1164,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1166,7 +1189,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1188,7 +1211,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Aliases:"
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1352,7 +1375,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1368,7 +1391,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1451,12 +1474,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1525,7 +1548,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 #, fuzzy
 msgid "Missing target directory"
 msgstr "%s no es un directorio"
@@ -1575,7 +1598,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1730,7 +1753,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1813,11 +1836,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1868,7 +1891,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1892,7 +1915,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1981,7 +2004,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1997,7 +2020,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -2054,15 +2077,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2090,7 +2113,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2386,7 +2409,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2405,7 +2428,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2449,7 +2472,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2536,7 +2559,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2706,6 +2729,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2793,7 +2820,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2872,7 +2899,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2967,7 +2994,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3081,13 +3108,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3119,7 +3146,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3139,7 +3166,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3211,7 +3238,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 6cdf51ad9..1139199a5 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index d6a5be92c..3e5c629c1 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 32a670c1d..f9c96b599 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: 2018-03-06 13:50+0000\n"
 "Last-Translator: Alban Vidal <alban.vidal at zordhak.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -247,7 +247,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (%d de plus)"
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s n'est pas un répertoire"
@@ -257,7 +257,7 @@ msgstr "%s n'est pas un répertoire"
 msgid "%v (interrupt two more times to force)"
 msgstr "%v (interrompre encore deux fois pour forcer)"
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr "'%s' n'est pas un format de fichier pris en charge."
@@ -292,7 +292,7 @@ msgstr "TYPE"
 msgid "Accept certificate"
 msgstr "Accepter le certificat"
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr "Action (GET par défaut)"
 
@@ -455,7 +455,7 @@ msgstr "Créé : %s"
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 #, fuzzy
 msgid "Can't pull a directory without --recursive"
 msgstr "impossible de récupérer un répertoire sans --recursive"
@@ -483,7 +483,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 #, fuzzy
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr "impossible de spécifier uid/gid/mode en mode récursif"
@@ -519,6 +519,10 @@ msgstr "Afficher la version du client"
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "Colonnes"
@@ -634,7 +638,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr "Créer tous répertoires nécessaires"
 
@@ -715,7 +719,7 @@ msgstr "Création de %s"
 msgid "Creating the container"
 msgstr "Création du conteneur"
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -778,20 +782,20 @@ msgstr "Copie de l'image : %s"
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -806,7 +810,7 @@ msgstr "Copie de l'image : %s"
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -927,6 +931,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "Variable d'environnement (de la forme HOME=/home/foo) à positionner"
@@ -1022,7 +1045,7 @@ msgstr "Profil à appliquer au nouveau conteneur"
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1045,7 +1068,7 @@ msgstr "Empreinte : %s"
 msgid "Force pseudo-terminal allocation"
 msgstr "Forcer l'allocation d'un pseudo-terminal"
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1185,7 +1208,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr "Import de l'image : %s"
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1253,7 +1276,7 @@ msgstr "Cible invalide %s"
 msgid "Invalid source %s"
 msgstr "Source invalide %s"
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr "Cible invalide %s"
@@ -1278,7 +1301,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1300,7 +1323,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Alias :"
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1528,7 +1551,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr "GÉRÉ"
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1544,7 +1567,7 @@ msgstr "Rendre l'image publique"
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1634,12 +1657,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "Profil %s supprimé de %s"
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
@@ -1714,7 +1737,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr "Copie de l'image : %s"
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 #, fuzzy
 msgid "Missing target directory"
 msgstr "%s n'est pas un répertoire"
@@ -1768,7 +1791,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr "NOM"
@@ -1928,7 +1951,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -2013,12 +2036,12 @@ msgstr "Création du conteneur"
 msgid "Pull files from containers"
 msgstr "Création du conteneur"
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 #, fuzzy
 msgid "Push files into containers"
 msgstr "Création du conteneur"
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 #, fuzzy
 msgid "Recursively transfer files"
 msgstr "Pousser ou récupérer des fichiers récursivement"
@@ -2072,7 +2095,7 @@ msgstr "Serveur distant : %s"
 msgid "Remove %s (yes/no): "
 msgstr "Supprimer %s (oui/non) : "
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2099,7 +2122,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2194,7 +2217,7 @@ msgstr "INSTANTANÉS"
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr "ÉTAT"
 
@@ -2211,7 +2234,7 @@ msgstr "ÉTAT"
 msgid "STORAGE POOL"
 msgstr "ENSEMBLE DE STOCKAGE"
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -2277,15 +2300,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr "impossible de supprimer le serveur distant par défaut"
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr "Définir le gid du fichier lors de l'envoi"
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr "Définir les permissions du fichier lors de l'envoi"
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr "Définir l'uid du fichier lors de l'envoi"
 
@@ -2317,7 +2340,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:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2632,7 +2655,7 @@ msgstr "Type : persistant"
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr "URL"
 
@@ -2651,7 +2674,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2702,7 +2725,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2794,7 +2817,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2980,6 +3003,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr "activé"
@@ -3068,7 +3095,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -3147,7 +3174,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3264,7 +3291,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3406,7 +3433,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 #, fuzzy
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
@@ -3416,7 +3443,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3453,7 +3480,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3481,7 +3508,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3558,7 +3585,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index 890a631be..2a43a7a73 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index fbaf8e461..6f9972b57 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 7db991b77..93dae026f 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: 2017-08-18 14:22+0000\n"
 "Last-Translator: Alberto Donato <alberto.donato at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -173,7 +173,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (altri %d)"
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -183,7 +183,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr "%v (interrompi altre due volte per forzare)"
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr "'%s' non è un tipo di file supportato."
@@ -216,7 +216,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr "Accetta certificato"
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr "Azione (default a GET)"
 
@@ -377,7 +377,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr "Impossibile effettuare il pull di una directory senza --recursive"
 
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -437,6 +437,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "Colonne"
@@ -544,7 +548,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -604,7 +608,7 @@ msgstr "Creazione di %s in corso"
 msgid "Creating the container"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -663,20 +667,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -691,7 +695,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -809,6 +813,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -892,7 +915,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -915,7 +938,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1043,7 +1066,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1111,7 +1134,7 @@ msgstr "Proprietà errata: %s"
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1136,7 +1159,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1158,7 +1181,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Alias:"
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1323,7 +1346,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1339,7 +1362,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1424,12 +1447,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1498,7 +1521,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1547,7 +1570,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1703,7 +1726,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1786,11 +1809,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1841,7 +1864,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1865,7 +1888,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1955,7 +1978,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1971,7 +1994,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -2028,15 +2051,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2064,7 +2087,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2363,7 +2386,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2382,7 +2405,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2426,7 +2449,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2514,7 +2537,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2684,6 +2707,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2771,7 +2798,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2850,7 +2877,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2945,7 +2972,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3059,13 +3086,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3097,7 +3124,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3117,7 +3144,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3189,7 +3216,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index b61546c36..667639c37 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: 2018-03-01 17:11+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -151,7 +151,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (他%d個)"
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s はディレクトリではありません"
@@ -162,7 +162,7 @@ msgid "%v (interrupt two more times to force)"
 msgstr ""
 "%v (強制的に中断したい場合はあと2回Ctrl-Cを入力/SIGINTを送出してください)"
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr "'%s' はサポートされないタイプのファイルです。"
@@ -195,7 +195,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr "証明書を受け入れます"
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr "使用するHTTPのメソッド (デフォルト: GET)"
 
@@ -360,7 +360,7 @@ msgstr "キャッシュ済: %s"
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 "ディレクトリを pull する場合は --recursive オプションを使用してください"
@@ -388,7 +388,7 @@ msgstr "リネームの場合は異なるリモートを指定できません。
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 #, fuzzy
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr "再帰 (recursive) モードでは uid/gid/mode を指定できません"
@@ -423,6 +423,10 @@ msgstr "クライアントのバージョンを表示します"
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "カラムレイアウト"
@@ -537,7 +541,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr "必要なディレクトリをすべて作成します"
 
@@ -613,7 +617,7 @@ msgstr "%s を作成中"
 msgid "Creating the container"
 msgstr "コンテナを作成中"
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -677,20 +681,20 @@ msgstr "ストレージボリュームの移動中: %s"
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -705,7 +709,7 @@ msgstr "ストレージボリュームの移動中: %s"
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -827,6 +831,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "環境変数を設定します (例: HOME=/home/foo)"
@@ -926,7 +949,7 @@ msgstr "新しいコンテナ名が取得できません"
 msgid "Failed to remove alias %s"
 msgstr "エイリアス %s の削除に失敗しました"
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr "パス %s にアクセスできませんでした: %s"
@@ -948,7 +971,7 @@ msgstr "証明書のフィンガープリント: %s"
 msgid "Force pseudo-terminal allocation"
 msgstr "強制的に擬似端末を割り当てます"
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1080,7 +1103,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr "イメージのエクスポート中: %s"
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr "入力するデータ"
 
@@ -1148,7 +1171,7 @@ msgstr "不正なプロトコル: %s"
 msgid "Invalid source %s"
 msgstr "不正なソース %s"
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr "不正な送り先 %s"
@@ -1173,7 +1196,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1195,7 +1218,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "エイリアス:"
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1460,7 +1483,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1476,7 +1499,7 @@ msgstr "イメージを public にする"
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1570,12 +1593,12 @@ msgstr "リモートのlxcサーバを管理します。\n"
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "ノード %s が削除されました"
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "ノード名 %s を %s に変更しました"
@@ -1649,7 +1672,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr "ストレージボリュームの移動中: %s"
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 #, fuzzy
 msgid "Missing target directory"
 msgstr "%s はディレクトリではありません"
@@ -1703,7 +1726,7 @@ msgstr "ディレクトリからのインポートは root で実行する必要
 msgid "Must supply container name for: "
 msgstr "コンテナ名を指定する必要があります: "
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1860,7 +1883,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr "レスポンスをそのまま表示します"
 
@@ -1945,12 +1968,12 @@ msgstr "コンテナを一時停止します。"
 msgid "Pull files from containers"
 msgstr "コンテナ上のファイルを管理します。\n"
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 #, fuzzy
 msgid "Push files into containers"
 msgstr "コンテナを一時停止します。"
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 #, fuzzy
 msgid "Recursively transfer files"
 msgstr "再帰的にファイルをpush/pullします"
@@ -2003,7 +2026,7 @@ msgstr "リモート名: %s"
 msgid "Remove %s (yes/no): "
 msgstr "%s を消去しますか (yes/no): "
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2030,7 +2053,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2125,7 +2148,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -2141,7 +2164,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -2205,15 +2228,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr "デフォルトのリモートは削除できません"
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr "プッシュ時にファイルのgidを設定します"
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr "プッシュ時にファイルのパーミションを設定します"
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr "プッシュ時にファイルのuidを設定します"
 
@@ -2245,7 +2268,7 @@ msgstr "詳細情報を表示します"
 msgid "Show content of container file templates"
 msgstr "一部のコンテナで %s が失敗しました"
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2565,7 +2588,7 @@ msgstr "タイプ: persistent"
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2584,7 +2607,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr "未知のファイルタイプ '%s'"
@@ -2637,7 +2660,7 @@ msgstr ""
 "ユーザからのシグナルを 3 度受信したので exit しました。リモート操作は実行し続"
 "けます。"
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr "処理が完全に終わるまで待ちます"
 
@@ -2725,7 +2748,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2910,6 +2933,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr "有効"
@@ -2997,7 +3024,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -3076,7 +3103,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3199,7 +3226,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3335,7 +3362,7 @@ msgstr ""
 "\n"
 "コンテナとコンテナのスナップショットを消去します。"
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 #, fuzzy
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
@@ -3345,7 +3372,7 @@ msgstr ""
 "\n"
 "%s%s"
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3383,7 +3410,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3408,7 +3435,7 @@ msgstr ""
 "\n"
 "コンテナ名もしくはスナップショット名を変更します。"
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3486,7 +3513,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/lxd.pot b/po/lxd.pot
index f02d3a719..00e982d12 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: 2018-04-10 00:41+0200\n"
+        "POT-Creation-Date: 2018-04-18 10:29+0000\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"
@@ -141,7 +141,7 @@ msgstr  ""
 msgid   "%s (%d more)"
 msgstr  ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid   "%s is not a directory"
 msgstr  ""
@@ -151,7 +151,7 @@ msgstr  ""
 msgid   "%v (interrupt two more times to force)"
 msgstr  ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid   "'%s' isn't a supported file type."
 msgstr  ""
@@ -184,7 +184,7 @@ msgstr  ""
 msgid   "Accept certificate"
 msgstr  ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid   "Action (defaults to GET)"
 msgstr  ""
 
@@ -341,7 +341,7 @@ msgstr  ""
 msgid   "Can't provide a name for the target image"
 msgstr  ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid   "Can't pull a directory without --recursive"
 msgstr  ""
 
@@ -366,7 +366,7 @@ msgstr  ""
 msgid   "Can't specify column L when not clustered"
 msgstr  ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid   "Can't supply uid/gid/mode in recursive mode"
 msgstr  ""
 
@@ -393,6 +393,10 @@ msgstr  ""
 msgid   "Cluster member name"
 msgstr  ""
 
+#: lxc/cluster.go:358
+msgid   "Clustering enabled"
+msgstr  ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid   "Columns"
 msgstr  ""
@@ -496,7 +500,7 @@ msgstr  ""
 msgid   "Create and start containers from images"
 msgstr  ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid   "Create any directories necessary"
 msgstr  ""
 
@@ -553,7 +557,7 @@ msgstr  ""
 msgid   "Creating the container"
 msgstr  ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid   "DATABASE"
 msgstr  ""
 
@@ -609,7 +613,7 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90 lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147 lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142 lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54 lxc/config_metadata.go:176 lxc/config_template.go:30 lxc/config_template.go:67 lxc/config_template.go:110 lxc/config_template.go:152 lxc/config_template.go:236 lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59 lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32 lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73 lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42 lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211 lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250 lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32 lxc/network.go:104 lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367 lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719 lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989 lxc/network.go:1051 lxc/operation.go:25 lxc/operation.go:54 lxc/operation.go:98 lxc/operation.go:174 lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241 lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520 lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753 lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27 lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414 lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636 lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:161 lxc/storage.go:208 lxc/storage.go:328 lxc/storage.go:383 lxc/storage.go:491 lxc/storage.go:573 lxc/storage.go:645 lxc/storage.go:729 lxc/storage_volume.go:34 lxc/storage_volume.go:122 lxc/storage_volume.go:201 lxc/storage_volume.go:283 lxc/storage_volume.go:426 lxc/storage_volume.go:501 lxc/storage_volume.go:561 lxc/storage_volume.go:643 lxc/storage_volume.go:724 lxc/storage_volume.go:853 lxc/storage_volume.go:918 lxc/storage_volume.go:994 lxc/storage_volume.go:1025 lxc/storage_volume.go:1089 lxc/storage_volume.go:1166 lxc/storage_volume.go:1241 lxc/version.go:22
+#: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90 lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147 lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147 lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29 lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54 lxc/config_metadata.go:176 lxc/config_template.go:30 lxc/config_template.go:67 lxc/config_template.go:110 lxc/config_template.go:152 lxc/config_template.go:236 lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59 lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32 lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73 lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42 lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211 lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250 lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32 lxc/network.go:104 lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367 lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719 lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989 lxc/network.go:1051 lxc/operation.go:25 lxc/operation.go:54 lxc/operation.go:98 lxc/operation.go:174 lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241 lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520 lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753 lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30 lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414 lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636 lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:161 lxc/storage.go:208 lxc/storage.go:328 lxc/storage.go:383 lxc/storage.go:491 lxc/storage.go:573 lxc/storage.go:645 lxc/storage.go:729 lxc/storage_volume.go:34 lxc/storage_volume.go:122 lxc/storage_volume.go:201 lxc/storage_volume.go:283 lxc/storage_volume.go:426 lxc/storage_volume.go:501 lxc/storage_volume.go:561 lxc/storage_volume.go:643 lxc/storage_volume.go:724 lxc/storage_volume.go:853 lxc/storage_volume.go:918 lxc/storage_volume.go:994 lxc/storage_volume.go:1025 lxc/storage_volume.go:1089 lxc/storage_volume.go:1166 lxc/storage_volume.go:1241 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -714,6 +718,21 @@ msgstr  ""
 msgid   "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr  ""
 
+#: lxc/cluster.go:289
+msgid   "Enable clustering on a single non-clustered LXD instance"
+msgstr  ""
+
+#: lxc/cluster.go:290
+msgid   "Enable clustering on a single non-clustered LXD instance\n"
+        "\n"
+        "This command turns a non-clustered LXD instance into the first node of a new\n"
+        "LXD cluster, which will have the given name.\n"
+        "\n"
+        "It's required that the LXD is already available on the network. You can check\n"
+        "that by running 'lxc config get core.https_address', and possibly set a value\n"
+        "for the address if not yet set."
+msgstr  ""
+
 #: lxc/exec.go:52
 msgid   "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr  ""
@@ -794,7 +813,7 @@ msgstr  ""
 msgid   "Failed to remove alias %s"
 msgstr  ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid   "Failed to walk path for %s: %s"
 msgstr  ""
@@ -816,7 +835,7 @@ msgstr  ""
 msgid   "Force pseudo-terminal allocation"
 msgstr  ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid   "Force removing a member, even if degraded"
 msgstr  ""
 
@@ -940,7 +959,7 @@ msgstr  ""
 msgid   "Import images into the image store"
 msgstr  ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid   "Input data"
 msgstr  ""
 
@@ -1006,7 +1025,7 @@ msgstr  ""
 msgid   "Invalid source %s"
 msgstr  ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid   "Invalid target %s"
 msgstr  ""
@@ -1031,7 +1050,7 @@ msgstr  ""
 msgid   "LXD - Command line client"
 msgstr  ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid   "LXD server isn't part of a cluster"
 msgstr  ""
 
@@ -1052,7 +1071,7 @@ msgstr  ""
 msgid   "List aliases"
 msgstr  ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid   "List all the cluster members"
 msgstr  ""
 
@@ -1210,7 +1229,7 @@ msgstr  ""
 msgid   "MANAGED"
 msgstr  ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid   "MESSAGE"
 msgstr  ""
 
@@ -1226,7 +1245,7 @@ msgstr  ""
 msgid   "Manage and attach containers to networks"
 msgstr  ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid   "Manage cluster members"
 msgstr  ""
 
@@ -1306,12 +1325,12 @@ msgstr  ""
 msgid   "Manage trusted clients"
 msgstr  ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid   "Member %s removed"
 msgstr  ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid   "Member %s renamed to %s"
 msgstr  ""
@@ -1364,7 +1383,7 @@ msgstr  ""
 msgid   "Missing source volume name"
 msgstr  ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid   "Missing target directory"
 msgstr  ""
 
@@ -1411,7 +1430,7 @@ msgstr  ""
 msgid   "Must supply container name for: "
 msgstr  ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613 lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613 lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid   "NAME"
 msgstr  ""
 
@@ -1563,7 +1582,7 @@ msgstr  ""
 msgid   "Print help"
 msgstr  ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid   "Print the raw response"
 msgstr  ""
 
@@ -1646,11 +1665,11 @@ msgstr  ""
 msgid   "Pull files from containers"
 msgstr  ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid   "Push files into containers"
 msgstr  ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid   "Recursively transfer files"
 msgstr  ""
 
@@ -1701,7 +1720,7 @@ msgstr  ""
 msgid   "Remove %s (yes/no): "
 msgstr  ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid   "Remove a member from the cluster"
 msgstr  ""
 
@@ -1725,7 +1744,7 @@ msgstr  ""
 msgid   "Remove trusted clients"
 msgstr  ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid   "Rename a cluster member"
 msgstr  ""
 
@@ -1811,7 +1830,7 @@ msgstr  ""
 msgid   "SOURCE"
 msgstr  ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid   "STATE"
 msgstr  ""
 
@@ -1827,7 +1846,7 @@ msgstr  ""
 msgid   "STORAGE POOL"
 msgstr  ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid   "Send a raw query to LXD"
 msgstr  ""
 
@@ -1884,15 +1903,15 @@ msgstr  ""
 msgid   "Set the default remote"
 msgstr  ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid   "Set the file's gid on push"
 msgstr  ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid   "Set the file's perms on push"
 msgstr  ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid   "Set the file's uid on push"
 msgstr  ""
 
@@ -1920,7 +1939,7 @@ msgstr  ""
 msgid   "Show content of container file templates"
 msgstr  ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid   "Show details of a cluster member"
 msgstr  ""
 
@@ -2211,7 +2230,7 @@ msgstr  ""
 msgid   "UPLOAD DATE"
 msgstr  ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid   "URL"
 msgstr  ""
 
@@ -2229,7 +2248,7 @@ msgstr  ""
 msgid   "Unknown column shorthand char '%c' in '%s'"
 msgstr  ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid   "Unknown file type '%s'"
 msgstr  ""
@@ -2271,7 +2290,7 @@ msgstr  ""
 msgid   "User signaled us three times, exiting. The remote operation will keep running."
 msgstr  ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid   "Wait for the operation to complete"
 msgstr  ""
 
@@ -2351,7 +2370,7 @@ msgstr  ""
 msgid   "attach-profile [<remote>:]<network> <profile> [<device name>] [<interface name>]"
 msgstr  ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid   "cluster"
 msgstr  ""
 
@@ -2519,6 +2538,10 @@ msgstr  ""
 msgid   "edit [<remote>:][<container>]"
 msgstr  ""
 
+#: lxc/cluster.go:287
+msgid   "enable [<remote>:] <name>"
+msgstr  ""
+
 #: lxc/image.go:820
 msgid   "enabled"
 msgstr  ""
@@ -2604,7 +2627,7 @@ msgstr  ""
 msgid   "list"
 msgstr  ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716 lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716 lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid   "list [<remote>:]"
 msgstr  ""
 
@@ -2673,7 +2696,7 @@ msgid   "lxc file pull foo/etc/hosts .\n"
         "   To pull /etc/hosts from the container and write it to the current directory."
 msgstr  ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid   "lxc file push /etc/hosts foo/etc/hosts\n"
         "   To push /etc/hosts into the container \"foo\"."
 msgstr  ""
@@ -2754,7 +2777,7 @@ msgid   "lxc profile edit <profile> < profile.yaml\n"
         "    Update a profile using the content of profile.yaml"
 msgstr  ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid   "lxc query -X DELETE --wait /1.0/containers/c1\n"
         "    Delete local container \"c1\"."
 msgstr  ""
@@ -2854,11 +2877,11 @@ msgstr  ""
 msgid   "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] <target path>"
 msgstr  ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid   "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr  ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid   "query [<remote>:]<API path>"
 msgstr  ""
 
@@ -2890,7 +2913,7 @@ msgstr  ""
 msgid   "remove [<remote>:]<container|profile> <name>..."
 msgstr  ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid   "remove [<remote>:]<member>"
 msgstr  ""
 
@@ -2910,7 +2933,7 @@ msgstr  ""
 msgid   "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr  ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid   "rename [<remote>:]<member> <new-name>"
 msgstr  ""
 
@@ -2982,7 +3005,7 @@ msgstr  ""
 msgid   "show [<remote>:]<image>"
 msgstr  ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid   "show [<remote>:]<member>"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 4ca7627de..69b5d3e87 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index e3a2b4691..16770b5f7 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index e763353e6..025f84b00 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 82a59dfec..4474363a5 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 785ac8e8f..3de43181d 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: 2018-03-08 09:21+0000\n"
 "Last-Translator: Paulo Coghi <paulo at coghi.com.br>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -175,7 +175,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -208,7 +208,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -367,7 +367,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -427,6 +427,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -534,7 +538,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -592,7 +596,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -651,20 +655,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -679,7 +683,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -797,6 +801,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -880,7 +903,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -902,7 +925,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1029,7 +1052,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1096,7 +1119,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1121,7 +1144,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1142,7 +1165,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1306,7 +1329,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1322,7 +1345,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1405,12 +1428,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1478,7 +1501,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1527,7 +1550,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1682,7 +1705,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1765,11 +1788,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1820,7 +1843,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1844,7 +1867,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1933,7 +1956,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1949,7 +1972,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -2006,15 +2029,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2042,7 +2065,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2338,7 +2361,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2357,7 +2380,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2401,7 +2424,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2487,7 +2510,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2657,6 +2680,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2744,7 +2771,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2823,7 +2850,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2918,7 +2945,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3032,13 +3059,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3070,7 +3097,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3090,7 +3117,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3162,7 +3189,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 9e77df3fd..32446705b 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: 2017-09-05 16:48+0000\n"
 "Last-Translator: Ilya Yakimavets <ilya.yakimavets at backend.expert>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -234,7 +234,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -244,7 +244,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -278,7 +278,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr "Принять сертификат"
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -440,7 +440,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -466,7 +466,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -500,6 +500,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "Столбцы"
@@ -608,7 +612,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -671,7 +675,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -733,20 +737,20 @@ msgstr "Копирование образа: %s"
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -761,7 +765,7 @@ msgstr "Копирование образа: %s"
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -881,6 +885,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -965,7 +988,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -987,7 +1010,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1116,7 +1139,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr "Копирование образа: %s"
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1183,7 +1206,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1208,7 +1231,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1230,7 +1253,7 @@ msgstr ""
 msgid "List aliases"
 msgstr "Псевдонимы:"
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1396,7 +1419,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1412,7 +1435,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1498,12 +1521,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1574,7 +1597,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr "Копирование образа: %s"
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1624,7 +1647,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1780,7 +1803,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1863,11 +1886,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1919,7 +1942,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1944,7 +1967,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2035,7 +2058,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -2051,7 +2074,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -2108,15 +2131,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2146,7 +2169,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2444,7 +2467,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2463,7 +2486,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2507,7 +2530,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2594,7 +2617,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2776,6 +2799,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2863,7 +2890,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2942,7 +2969,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3037,7 +3064,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3163,7 +3190,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 #, fuzzy
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
@@ -3173,7 +3200,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3209,7 +3236,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3233,7 +3260,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3309,7 +3336,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 01aadf6a6..d37f48582 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 7a8384798..16f9bb7ed 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 7f5fc6d6a..9e5565a3e 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index e516fb82a..303e6bae7 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/zh.po b/po/zh.po
index 88c436e72..8ec8fc1f7 100644
--- a/po/zh.po
+++ b/po/zh.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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index ef258d990..3add5b4bf 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: 2018-04-10 00:41+0200\n"
+"POT-Creation-Date: 2018-04-18 10:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -148,7 +148,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:696
+#: lxc/file.go:704
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:633
+#: lxc/file.go:641
 #, c-format
 msgid "'%s' isn't a supported file type."
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/query.go:37
+#: lxc/query.go:40
 msgid "Action (defaults to GET)"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:261
+#: lxc/file.go:269
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:426
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -410,6 +410,10 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
+#: lxc/cluster.go:358
+msgid "Clustering enabled"
+msgstr ""
+
 #: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
@@ -517,7 +521,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:191 lxc/file.go:351
+#: lxc/file.go:191 lxc/file.go:359
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -575,7 +579,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/cluster.go:121
+#: lxc/cluster.go:126
 msgid "DATABASE"
 msgstr ""
 
@@ -634,20 +638,20 @@ msgstr ""
 
 #: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90
 #: lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147
-#: lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142
-#: lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88
-#: lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560
-#: lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179
-#: lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405
-#: lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650
-#: lxc/config_metadata.go:29 lxc/config_metadata.go:54
+#: lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29
+#: lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452
+#: lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76
+#: lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318
+#: lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582
+#: lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54
 #: lxc/config_metadata.go:176 lxc/config_template.go:30
 #: lxc/config_template.go:67 lxc/config_template.go:110
 #: lxc/config_template.go:152 lxc/config_template.go:236
 #: lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59
 #: lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
-#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:344 lxc/image.go:42
+#: lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
 #: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
 #: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
@@ -662,7 +666,7 @@ msgstr ""
 #: lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241
 #: lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520
 #: lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753
-#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27
+#: lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30
 #: lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414
 #: lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636
 #: lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33
@@ -780,6 +784,25 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
+#: lxc/cluster.go:289
+msgid "Enable clustering on a single non-clustered LXD instance"
+msgstr ""
+
+#: lxc/cluster.go:290
+msgid ""
+"Enable clustering on a single non-clustered LXD instance\n"
+"\n"
+"This command turns a non-clustered LXD instance into the first node of a "
+"new\n"
+"LXD cluster, which will have the given name.\n"
+"\n"
+"It's required that the LXD is already available on the network. You can "
+"check\n"
+"that by running 'lxc config get core.https_address', and possibly set a "
+"value\n"
+"for the address if not yet set."
+msgstr ""
+
 #: lxc/exec.go:52
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
@@ -863,7 +886,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:628
+#: lxc/file.go:636
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -885,7 +908,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:242
+#: lxc/cluster.go:247
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1012,7 +1035,7 @@ msgstr ""
 msgid "Import images into the image store"
 msgstr ""
 
-#: lxc/query.go:38
+#: lxc/query.go:41
 msgid "Input data"
 msgstr ""
 
@@ -1079,7 +1102,7 @@ msgstr ""
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:372
+#: lxc/file.go:380
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1104,7 +1127,7 @@ msgstr ""
 msgid "LXD - Command line client"
 msgstr ""
 
-#: lxc/cluster.go:94
+#: lxc/cluster.go:99
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
@@ -1125,7 +1148,7 @@ msgstr ""
 msgid "List aliases"
 msgstr ""
 
-#: lxc/cluster.go:58 lxc/cluster.go:59
+#: lxc/cluster.go:63 lxc/cluster.go:64
 msgid "List all the cluster members"
 msgstr ""
 
@@ -1289,7 +1312,7 @@ msgstr ""
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/cluster.go:123
+#: lxc/cluster.go:128
 msgid "MESSAGE"
 msgstr ""
 
@@ -1305,7 +1328,7 @@ msgstr ""
 msgid "Manage and attach containers to networks"
 msgstr ""
 
-#: lxc/cluster.go:25 lxc/cluster.go:26
+#: lxc/cluster.go:26 lxc/cluster.go:27
 msgid "Manage cluster members"
 msgstr ""
 
@@ -1388,12 +1411,12 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:268
+#: lxc/cluster.go:273
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:221
+#: lxc/cluster.go:226
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -1461,7 +1484,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:465
+#: lxc/file.go:473
 msgid "Missing target directory"
 msgstr ""
 
@@ -1510,7 +1533,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/cluster.go:119 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
+#: lxc/cluster.go:124 lxc/list.go:474 lxc/network.go:781 lxc/profile.go:613
 #: lxc/remote.go:463 lxc/storage.go:544 lxc/storage_volume.go:966
 msgid "NAME"
 msgstr ""
@@ -1665,7 +1688,7 @@ msgstr ""
 msgid "Print help"
 msgstr ""
 
-#: lxc/query.go:36
+#: lxc/query.go:39
 msgid "Print the raw response"
 msgstr ""
 
@@ -1748,11 +1771,11 @@ msgstr ""
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:343 lxc/file.go:344
+#: lxc/file.go:351 lxc/file.go:352
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:192 lxc/file.go:350
+#: lxc/file.go:192 lxc/file.go:358
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -1803,7 +1826,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:237 lxc/cluster.go:238
+#: lxc/cluster.go:242 lxc/cluster.go:243
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -1827,7 +1850,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:191 lxc/cluster.go:192
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -1916,7 +1939,7 @@ msgstr ""
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/cluster.go:122 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
+#: lxc/cluster.go:127 lxc/list.go:479 lxc/network.go:788 lxc/storage.go:549
 msgid "STATE"
 msgstr ""
 
@@ -1932,7 +1955,7 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/query.go:26 lxc/query.go:27
+#: lxc/query.go:29 lxc/query.go:30
 msgid "Send a raw query to LXD"
 msgstr ""
 
@@ -1989,15 +2012,15 @@ msgstr ""
 msgid "Set the default remote"
 msgstr ""
 
-#: lxc/file.go:353
+#: lxc/file.go:361
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:354
+#: lxc/file.go:362
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:360
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -2025,7 +2048,7 @@ msgstr ""
 msgid "Show content of container file templates"
 msgstr ""
 
-#: lxc/cluster.go:141 lxc/cluster.go:142
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:120 lxc/remote.go:464
+#: lxc/cluster.go:125 lxc/remote.go:464
 msgid "URL"
 msgstr ""
 
@@ -2340,7 +2363,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:615
+#: lxc/file.go:623
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -2384,7 +2407,7 @@ msgid ""
 "running."
 msgstr ""
 
-#: lxc/query.go:35
+#: lxc/query.go:38
 msgid "Wait for the operation to complete"
 msgstr ""
 
@@ -2470,7 +2493,7 @@ msgid ""
 "name>]"
 msgstr ""
 
-#: lxc/cluster.go:24
+#: lxc/cluster.go:25
 msgid "cluster"
 msgstr ""
 
@@ -2640,6 +2663,10 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
+#: lxc/cluster.go:287
+msgid "enable [<remote>:] <name>"
+msgstr ""
+
 #: lxc/image.go:820
 msgid "enabled"
 msgstr ""
@@ -2727,7 +2754,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:56 lxc/config_trust.go:112 lxc/network.go:716
+#: lxc/cluster.go:61 lxc/config_trust.go:112 lxc/network.go:716
 #: lxc/operation.go:95 lxc/profile.go:565 lxc/storage.go:488
 msgid "list [<remote>:]"
 msgstr ""
@@ -2806,7 +2833,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: lxc/file.go:346
+#: lxc/file.go:354
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -2901,7 +2928,7 @@ msgid ""
 "    Update a profile using the content of profile.yaml"
 msgstr ""
 
-#: lxc/query.go:29
+#: lxc/query.go:32
 msgid ""
 "lxc query -X DELETE --wait /1.0/containers/c1\n"
 "    Delete local container \"c1\"."
@@ -3015,13 +3042,13 @@ msgid ""
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:342
+#: lxc/file.go:350
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
 msgstr ""
 
-#: lxc/query.go:25
+#: lxc/query.go:28
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
@@ -3053,7 +3080,7 @@ msgstr ""
 msgid "remove [<remote>:]<container|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:235
+#: lxc/cluster.go:240
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -3073,7 +3100,7 @@ msgstr ""
 msgid "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:189
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -3145,7 +3172,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/cluster.go:140
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 


More information about the lxc-devel mailing list