[lxc-devel] [lxd/master] Add support for `--empty`

stgraber on Github lxc-bot at linuxcontainers.org
Mon Jul 15 21:38:28 UTC 2019


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190715/f4d3ff6a/attachment-0001.bin>
-------------- next part --------------
From 67db8369f33879c4e54be770b3ff011104912b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 15 Jul 2019 17:06:50 -0400
Subject: [PATCH 1/3] doc/containers: Fix markdown escaping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/doc/containers.md b/doc/containers.md
index 0373bee4e8..daa7998faf 100644
--- a/doc/containers.md
+++ b/doc/containers.md
@@ -281,8 +281,8 @@ ipv6.address             | string    | -                 | no        | network
 ipv4.routes              | string    | -                 | no        | container\_nic\_routes                 | Comma delimited list of IPv4 static routes to add on host to nic
 ipv6.routes              | string    | -                 | no        | container\_nic\_routes                 | Comma delimited list of IPv6 static routes to add on host to nic
 security.mac\_filtering  | boolean   | false             | no        | network                                | Prevent the container from spoofing another's MAC address
-security.ipv4\_filtering | boolean   | false             | no        | container\_nic\_ipfilter               | Prevent the container from spoofing another's IPv4 address (enables mac_filtering)
-security.ipv6\_filtering | boolean   | false             | no        | container\_nic\_ipfilter               | Prevent the container from spoofing another's IPv6 address (enables mac_filtering)
+security.ipv4\_filtering | boolean   | false             | no        | container\_nic\_ipfilter               | Prevent the container from spoofing another's IPv4 address (enables mac\_filtering)
+security.ipv6\_filtering | boolean   | false             | no        | container\_nic\_ipfilter               | Prevent the container from spoofing another's IPv6 address (enables mac\_filtering)
 maas.subnet.ipv4         | string    | -                 | no        | maas\_network                          | MAAS IPv4 subnet to register the container in
 maas.subnet.ipv6         | string    | -                 | no        | maas\_network                          | MAAS IPv6 subnet to register the container in
 

From cb3cdd5e097eb3c6dab8848950a5d556b95389ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 15 Jul 2019 17:37:38 -0400
Subject: [PATCH 2/3] lxc/init: Add support for --empty
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/init.go b/lxc/init.go
index 2960a35c9c..9472e68e95 100644
--- a/lxc/init.go
+++ b/lxc/init.go
@@ -26,16 +26,15 @@ type cmdInit struct {
 	flagTarget     string
 	flagType       string
 	flagNoProfiles bool
+	flagEmpty      bool
 }
 
 func (c *cmdInit) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("init [<remote>:]<image> [<remote>:][<name>]")
+	cmd.Use = i18n.G("init [[<remote>:]<image>] [<remote>:][<name>]")
 	cmd.Short = i18n.G("Create containers from images")
-	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Create containers from images`))
-	cmd.Example = cli.FormatSection("", i18n.G(
-		`lxc init ubuntu:16.04 u1`))
+	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(`Create containers from images`))
+	cmd.Example = cli.FormatSection("", i18n.G(`lxc init ubuntu:16.04 u1`))
 	cmd.Hidden = true
 
 	cmd.RunE = c.Run
@@ -47,13 +46,14 @@ func (c *cmdInit) Command() *cobra.Command {
 	cmd.Flags().StringVarP(&c.flagType, "type", "t", "", i18n.G("Instance type")+"``")
 	cmd.Flags().StringVar(&c.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
 	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Create the container with no profiles applied"))
+	cmd.Flags().BoolVar(&c.flagEmpty, "empty", false, i18n.G("Create an empty container"))
 
 	return cmd
 }
 
 func (c *cmdInit) Run(cmd *cobra.Command, args []string) error {
 	// Sanity checks
-	exit, err := c.global.CheckArgs(cmd, args, 1, 2)
+	exit, err := c.global.CheckArgs(cmd, args, 0, 2)
 	if exit {
 		return err
 	}
@@ -63,22 +63,47 @@ func (c *cmdInit) Run(cmd *cobra.Command, args []string) error {
 }
 
 func (c *cmdInit) create(conf *config.Config, args []string) (lxd.ContainerServer, string, error) {
-	iremote, image, err := conf.ParseRemote(args[0])
-	if err != nil {
-		return nil, "", err
-	}
-
 	var name string
+	var image string
 	var remote string
-	if len(args) == 2 {
-		remote, name, err = conf.ParseRemote(args[1])
+	var iremote string
+	var err error
+
+	if len(args) > 0 {
+		iremote, image, err = conf.ParseRemote(args[0])
 		if err != nil {
 			return nil, "", err
 		}
-	} else {
-		remote, name, err = conf.ParseRemote("")
-		if err != nil {
-			return nil, "", err
+
+		if len(args) == 1 {
+			remote, name, err = conf.ParseRemote("")
+			if err != nil {
+				return nil, "", err
+			}
+		} else if len(args) == 2 {
+			remote, name, err = conf.ParseRemote(args[1])
+			if err != nil {
+				return nil, "", err
+			}
+		}
+	}
+
+	if c.flagEmpty {
+		if len(args) > 1 {
+			return nil, "", fmt.Errorf(i18n.G("--empty cannot be combined with an image name"))
+		}
+
+		if len(args) == 0 {
+			remote, name, err = conf.ParseRemote("")
+			if err != nil {
+				return nil, "", err
+			}
+		} else if len(args) == 1 {
+			// Switch image / container names
+			name = image
+			remote = iremote
+			image = ""
+			iremote = ""
 		}
 	}
 
@@ -142,26 +167,6 @@ func (c *cmdInit) create(conf *config.Config, args []string) (lxd.ContainerServe
 		}
 	}
 
-	// Get the image server and image info
-	iremote, image = c.guessImage(conf, d, remote, iremote, image)
-	var imgRemote lxd.ImageServer
-	var imgInfo *api.Image
-
-	// Connect to the image server
-	if iremote == remote {
-		imgRemote = d
-	} else {
-		imgRemote, err = conf.GetImageServer(iremote)
-		if err != nil {
-			return nil, "", err
-		}
-	}
-
-	// Deal with the default image
-	if image == "" {
-		image = "default"
-	}
-
 	// Setup container creation request
 	req := api.ContainersPost{
 		Name:         name,
@@ -176,61 +181,95 @@ func (c *cmdInit) create(conf *config.Config, args []string) (lxd.ContainerServe
 	}
 	req.Ephemeral = c.flagEphemeral
 
-	// Optimisation for simplestreams
-	if conf.Remotes[iremote].Protocol == "simplestreams" {
-		imgInfo = &api.Image{}
-		imgInfo.Fingerprint = image
-		imgInfo.Public = true
-		req.Source.Alias = image
-	} else {
-		// Attempt to resolve an image alias
-		alias, _, err := imgRemote.GetImageAlias(image)
-		if err == nil {
+	var opInfo api.Operation
+	if !c.flagEmpty {
+		// Get the image server and image info
+		iremote, image = c.guessImage(conf, d, remote, iremote, image)
+		var imgRemote lxd.ImageServer
+		var imgInfo *api.Image
+
+		// Connect to the image server
+		if iremote == remote {
+			imgRemote = d
+		} else {
+			imgRemote, err = conf.GetImageServer(iremote)
+			if err != nil {
+				return nil, "", err
+			}
+		}
+
+		// Deal with the default image
+		if image == "" {
+			image = "default"
+		}
+
+		// Optimisation for simplestreams
+		if conf.Remotes[iremote].Protocol == "simplestreams" {
+			imgInfo = &api.Image{}
+			imgInfo.Fingerprint = image
+			imgInfo.Public = true
 			req.Source.Alias = image
-			image = alias.Target
+		} else {
+			// Attempt to resolve an image alias
+			alias, _, err := imgRemote.GetImageAlias(image)
+			if err == nil {
+				req.Source.Alias = image
+				image = alias.Target
+			}
+
+			// Get the image info
+			imgInfo, _, err = imgRemote.GetImage(image)
+			if err != nil {
+				return nil, "", err
+			}
 		}
 
-		// Get the image info
-		imgInfo, _, err = imgRemote.GetImage(image)
+		// Create the container
+		op, err := d.CreateContainerFromImage(imgRemote, *imgInfo, req)
 		if err != nil {
 			return nil, "", err
 		}
-	}
 
-	// Create the container
-	op, err := d.CreateContainerFromImage(imgRemote, *imgInfo, req)
-	if err != nil {
-		return nil, "", err
-	}
+		// Watch the background operation
+		progress := utils.ProgressRenderer{
+			Format: i18n.G("Retrieving image: %s"),
+			Quiet:  c.global.flagQuiet,
+		}
 
-	// Watch the background operation
-	progress := utils.ProgressRenderer{
-		Format: i18n.G("Retrieving image: %s"),
-		Quiet:  c.global.flagQuiet,
-	}
+		_, err = op.AddHandler(progress.UpdateOp)
+		if err != nil {
+			progress.Done("")
+			return nil, "", err
+		}
 
-	_, err = op.AddHandler(progress.UpdateOp)
-	if err != nil {
+		err = utils.CancelableWait(op, &progress)
+		if err != nil {
+			progress.Done("")
+			return nil, "", err
+		}
 		progress.Done("")
-		return nil, "", err
-	}
 
-	err = utils.CancelableWait(op, &progress)
-	if err != nil {
-		progress.Done("")
-		return nil, "", err
-	}
-	progress.Done("")
+		// Extract the container name
+		info, err := op.GetTarget()
+		if err != nil {
+			return nil, "", err
+		}
 
-	// Extract the container name
-	opInfo, err := op.GetTarget()
-	if err != nil {
-		return nil, "", err
+		opInfo = *info
+	} else {
+		req.Source.Type = "none"
+
+		op, err := d.CreateContainer(req)
+		if err != nil {
+			return nil, "", err
+		}
+
+		opInfo = op.Get()
 	}
 
 	containers, ok := opInfo.Resources["containers"]
 	if !ok || len(containers) == 0 {
-		return nil, "", fmt.Errorf(i18n.G("didn't get any affected image, container or snapshot from server"))
+		return nil, "", fmt.Errorf(i18n.G("Didn't get any affected image, container or snapshot from server"))
 	}
 
 	if len(containers) == 1 && name == "" {

From 0c4d741417c5c54b8e3d5618d6d7a58252368736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 15 Jul 2019 17:38:02 -0400
Subject: [PATCH 3/3] i18n: Update translation template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 po/de.po      | 74 +++++++++++++++++++++++++++++----------------------
 po/el.po      | 62 +++++++++++++++++++++++-------------------
 po/es.po      | 63 ++++++++++++++++++++++++-------------------
 po/fa.po      | 62 +++++++++++++++++++++++-------------------
 po/fi.po      | 62 +++++++++++++++++++++++-------------------
 po/fr.po      | 68 +++++++++++++++++++++++++++-------------------
 po/hi.po      | 62 +++++++++++++++++++++++-------------------
 po/id.po      | 62 +++++++++++++++++++++++-------------------
 po/it.po      | 63 ++++++++++++++++++++++++-------------------
 po/ja.po      | 72 ++++++++++++++++++++++++++++---------------------
 po/ko.po      | 62 +++++++++++++++++++++++-------------------
 po/lxd.pot    | 62 +++++++++++++++++++++++-------------------
 po/nb_NO.po   | 62 +++++++++++++++++++++++-------------------
 po/nl.po      | 62 +++++++++++++++++++++++-------------------
 po/pa.po      | 62 +++++++++++++++++++++++-------------------
 po/pl.po      | 62 +++++++++++++++++++++++-------------------
 po/pt_BR.po   | 63 ++++++++++++++++++++++++-------------------
 po/ru.po      | 67 +++++++++++++++++++++++++++-------------------
 po/sr.po      | 62 +++++++++++++++++++++++-------------------
 po/sv.po      | 62 +++++++++++++++++++++++-------------------
 po/tr.po      | 62 +++++++++++++++++++++++-------------------
 po/uk.po      | 62 +++++++++++++++++++++++-------------------
 po/zh_Hans.po | 62 +++++++++++++++++++++++-------------------
 23 files changed, 833 insertions(+), 629 deletions(-)

diff --git a/po/de.po b/po/de.po
index f8a0479f02..b9aa5deca1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2018-11-30 03:10+0000\n"
 "Last-Translator: ssantos <ssantos at web.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -336,6 +336,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -500,7 +504,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -668,7 +672,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -701,7 +705,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 #, fuzzy
 msgid "Config key/value to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -731,7 +735,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -826,6 +830,11 @@ msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+#, fuzzy
+msgid "Create an empty container"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -847,7 +856,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 #, fuzzy
 msgid "Create containers from images"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -881,7 +890,7 @@ msgstr "Fehlerhafte Profil URL %s"
 msgid "Create storage pools"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 #, fuzzy
 msgid "Create the container with no profiles applied"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -891,12 +900,12 @@ msgstr "Anhalten des Containers fehlgeschlagen!"
 msgid "Created: %s"
 msgstr "Erstellt: %s"
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr "Erstelle %s"
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 #, fuzzy
 msgid "Creating the container"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -995,7 +1004,7 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -1072,6 +1081,12 @@ msgstr ""
 "Optionen:\n"
 "\n"
 
+#: lxc/init.go:272
+#, fuzzy
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+"Falsche Anzahl an Objekten im Abbild, Container oder Sicherungspunkt gelesen."
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1195,7 +1210,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr "Flüchtiger Container"
 
@@ -1560,7 +1575,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2236,7 +2251,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Network %s renamed to %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2459,7 +2474,7 @@ msgstr "Gerät %s wurde von %s entfernt\n"
 msgid "Profile %s renamed to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 #, fuzzy
 msgid "Profile to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -2727,7 +2742,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Retrieve the container's console log"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -3037,7 +3052,7 @@ msgstr "Profil %s gelöscht\n"
 msgid "Storage pool %s pending on member %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 #, fuzzy
 msgid "Storage pool name"
 msgstr "Profilname kann nicht geändert werden"
@@ -3124,7 +3139,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -3139,12 +3154,12 @@ msgstr "entfernte Instanz %s existiert bereits"
 msgid "The device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -3187,11 +3202,11 @@ msgstr "Wartezeit bevor der Container gestoppt wird."
 msgid "Timestamps:"
 msgstr "Zeitstempel:\n"
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3623,10 +3638,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3800,9 +3811,13 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+#, fuzzy
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
 
 #: lxc/launch.go:21
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
@@ -4950,11 +4965,6 @@ msgstr ""
 #~ msgid "Could not create config dir"
 #~ msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 
-#~ msgid "bad number of things scanned from image, container or snapshot"
-#~ msgstr ""
-#~ "Falsche Anzahl an Objekten im Abbild, Container oder Sicherungspunkt "
-#~ "gelesen."
-
 #~ msgid "can't copy to the same container name"
 #~ msgstr "kann nicht zum selben Container Namen kopieren"
 
diff --git a/po/el.po b/po/el.po
index c1d069fdaf..0b600239c7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -211,6 +211,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -370,7 +374,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -524,7 +528,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -557,7 +561,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -584,7 +588,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -674,6 +678,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -694,7 +702,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -722,7 +730,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -731,12 +739,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -830,7 +838,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -903,6 +911,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1024,7 +1036,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1373,7 +1385,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2007,7 +2019,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2226,7 +2238,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2475,7 +2487,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2772,7 +2784,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2855,7 +2867,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2868,12 +2880,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2911,11 +2923,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3316,10 +3328,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3470,8 +3478,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/es.po b/po/es.po
index 5c15c45562..baa2b1ed97 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2019-06-13 16:56+0000\n"
 "Last-Translator: Alonso José Lara Plana <alonso.lara.plana at gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -283,6 +283,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr "--container-only no se puede pasar cuando la fuente es una instantánea"
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -443,7 +447,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -598,7 +602,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -631,7 +635,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -658,7 +662,7 @@ msgstr "Log de la consola:"
 msgid "Container name is mandatory"
 msgstr "Nombre del contenedor es obligatorio"
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr "Nombre del contenedor es: %s"
@@ -749,6 +753,11 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+#, fuzzy
+msgid "Create an empty container"
+msgstr "Creando el contenedor"
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -770,7 +779,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -798,7 +807,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -807,12 +816,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr "Creado: %s"
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr "Creando %s"
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr "Creando el contenedor"
 
@@ -906,7 +915,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -979,6 +988,10 @@ msgstr "El dispostivo ya existe: %s"
 msgid "Device: %s"
 msgstr "Cacheado: %s"
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr "El directorio importado no está disponible en esta plataforma"
@@ -1099,7 +1112,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1451,7 +1464,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2087,7 +2100,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2305,7 +2318,7 @@ msgstr "Perfil %s eliminado de %s"
 msgid "Profile %s renamed to %s"
 msgstr "Perfil %s renombrado a %s"
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr "Perfil para aplicar al nuevo contenedor"
 
@@ -2554,7 +2567,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2851,7 +2864,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2934,7 +2947,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2947,12 +2960,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2990,11 +3003,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3396,10 +3409,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3551,8 +3560,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/fa.po b/po/fa.po
index baa2585a2a..a7adbdb825 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/fi.po b/po/fi.po
index f8b547a3b3..0ca7ca4c5a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/fr.po b/po/fr.po
index c410eba5a9..2f7296f109 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2019-01-04 18:07+0000\n"
 "Last-Translator: Deleted User <noreply+12102 at weblate.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -326,6 +326,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -491,7 +495,7 @@ msgstr "Image copiée avec succès !"
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -650,7 +654,7 @@ msgid "Client version: %s\n"
 msgstr "Afficher la version du client"
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -689,7 +693,7 @@ msgstr ""
 "commandes ci-dessous.\n"
 "Pour de l'aide avec l'une des commandes, simplement les utiliser avec --help."
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
@@ -718,7 +722,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr "Le nom du conteneur est obligatoire"
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr "Le nom du conteneur est : %s"
@@ -812,6 +816,11 @@ msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+#, fuzzy
+msgid "Create an empty container"
+msgstr "Création du conteneur"
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -849,7 +858,7 @@ msgstr ""
 "Exemple :\n"
 "    lxc snapshot u1 snap0"
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 #, fuzzy
 msgid "Create containers from images"
 msgstr "Création du conteneur"
@@ -883,7 +892,7 @@ msgstr "Créé : %s"
 msgid "Create storage pools"
 msgstr "Copie de l'image : %s"
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 #, fuzzy
 msgid "Create the container with no profiles applied"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -893,12 +902,12 @@ msgstr "L'arrêt du conteneur a échoué !"
 msgid "Created: %s"
 msgstr "Créé : %s"
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr "Création de %s"
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr "Création du conteneur"
 
@@ -997,7 +1006,7 @@ msgstr "Copie de l'image : %s"
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -1070,6 +1079,11 @@ msgstr "le serveur distant %s existe déjà"
 msgid "Device: %s"
 msgstr "Serveur distant : %s"
 
+#: lxc/init.go:272
+#, fuzzy
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr "pas d'image, conteneur ou instantané affecté sur ce serveur"
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr "L'importation de répertoire n'est pas disponible sur cette plateforme"
@@ -1195,7 +1209,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "Variable d'environnement (de la forme HOME=/home/foo) à positionner"
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr "Conteneur éphémère"
 
@@ -1575,7 +1589,7 @@ msgstr "Ignorer l'état du conteneur (seulement pour start)"
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2297,7 +2311,7 @@ msgstr "Le réseau %s a été créé"
 msgid "Network %s renamed to %s"
 msgstr "Le réseau %s a été créé"
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr "Nom du réseau"
 
@@ -2528,7 +2542,7 @@ msgstr "Profil %s supprimé de %s"
 msgid "Profile %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr "Profil à appliquer au nouveau conteneur"
 
@@ -2796,7 +2810,7 @@ msgstr "Forcer le conteneur à s'arrêter"
 msgid "Retrieve the container's console log"
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr "Récupération de l'image : %s"
@@ -3118,7 +3132,7 @@ msgstr "Le réseau %s a été supprimé"
 msgid "Storage pool %s pending on member %s"
 msgstr "Le réseau %s a été créé"
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr "Nom de l'ensemble de stockage"
 
@@ -3211,7 +3225,7 @@ msgstr ""
 "Le conteneur est en cours d'exécution. Utiliser --force pour qu'il soit "
 "arrêté et redémarré."
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 "Le conteneur que vous démarrez n'est attaché à aucune interface réseau."
@@ -3226,12 +3240,12 @@ msgstr "Le périphérique n'existe pas"
 msgid "The device doesn't exist"
 msgstr "Le périphérique n'existe pas"
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, fuzzy, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr "L'image locale '%s' n'a pas été trouvée, essayer '%s:' à la place."
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr "L'image locale '%s' n'a pas été trouvée, essayer '%s:' à la place."
@@ -3270,11 +3284,11 @@ msgstr "Temps d'attente du conteneur avant de le tuer"
 msgid "Timestamps:"
 msgstr "Horodatage :"
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr "Pour attacher un réseau à un conteneur, utiliser : lxc network attach"
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr "Pour créer un réseau, utiliser : lxc network create"
 
@@ -3718,10 +3732,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr "pas d'image, conteneur ou instantané affecté sur ce serveur"
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr "désactivé"
@@ -3905,9 +3915,13 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+#, fuzzy
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/launch.go:21
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
diff --git a/po/hi.po b/po/hi.po
index bc4086a3ce..2f09e6b0e2 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/id.po b/po/id.po
index 46dfa909b9..96a7ecf236 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/it.po b/po/it.po
index 4efa68122d..928f262a24 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\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/"
@@ -248,6 +248,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -408,7 +412,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -562,7 +566,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -595,7 +599,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr "Il nome del container è: %s"
@@ -712,6 +716,11 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+#, fuzzy
+msgid "Create an empty container"
+msgstr "Creazione del container in corso"
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -733,7 +742,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 #, fuzzy
 msgid "Create containers from images"
 msgstr "Creazione del container in corso"
@@ -762,7 +771,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -771,12 +780,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr "Creazione di %s in corso"
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr "Creazione del container in corso"
 
@@ -870,7 +879,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -943,6 +952,10 @@ msgstr "La periferica esiste già: %s"
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr "Import da directory non disponibile su questa piattaforma"
@@ -1063,7 +1076,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1417,7 +1430,7 @@ msgstr "Creazione del container in corso"
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2056,7 +2069,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2275,7 +2288,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2525,7 +2538,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2823,7 +2836,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2907,7 +2920,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2920,12 +2933,12 @@ msgstr "La periferica esiste già"
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2964,11 +2977,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3372,10 +3385,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3527,8 +3536,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/ja.po b/po/ja.po
index c6a13a6c75..33ddae1b6b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2019-05-18 08:49+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -212,6 +212,11 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr "--container-only はコピー元がスナップショットの場合は指定できません"
 
+#: lxc/init.go:93
+#, fuzzy
+msgid "--empty cannot be combined with an image name"
+msgstr "--refresh はコンテナの場合のみ使えます"
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr "--refresh はコンテナの場合のみ使えます"
@@ -376,7 +381,7 @@ msgstr "バックアップのエクスポートが成功しました!"
 msgid "Bad key/value pair: %s"
 msgstr "不適切なキー/値のペア: %s"
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -533,7 +538,7 @@ msgid "Client version: %s\n"
 msgstr "クライアントバージョン: %s\n"
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -570,7 +575,7 @@ msgstr ""
 "LXD の機能のすべてが、以下の色々なコマンドから操作できます。\n"
 "コマンドのヘルプは、--help をコマンドに付けて実行するだけです。"
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr "新しいコンテナに適用するキー/値の設定"
 
@@ -597,7 +602,7 @@ msgstr "コンソールログ:"
 msgid "Container name is mandatory"
 msgstr "コンテナ名を指定する必要があります"
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr "コンテナ名: %s"
@@ -692,6 +697,11 @@ msgstr "サーバ証明書格納用のディレクトリを作成できません
 msgid "Create aliases for existing images"
 msgstr "既存のイメージに対するエイリアスを作成します"
 
+#: lxc/init.go:49
+#, fuzzy
+msgid "Create an empty container"
+msgstr "コンテナを作成中"
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr "イメージからコンテナを作成し、起動します"
@@ -716,7 +726,7 @@ msgstr ""
 "--stateful を指定すると、LXD はコンテナの実行状態(プロセスのメモリ状態、TCP"
 "コネクション、など…を含む)を保存しようとします。"
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr "イメージからコンテナを作成します"
 
@@ -744,7 +754,7 @@ msgstr "プロジェクトを作成します"
 msgid "Create storage pools"
 msgstr "ストレージプールを作成します"
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr "プロファイルを適用しないコンテナを作成します"
 
@@ -753,12 +763,12 @@ msgstr "プロファイルを適用しないコンテナを作成します"
 msgid "Created: %s"
 msgstr "作成日時: %s"
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr "%s を作成中"
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr "コンテナを作成中"
 
@@ -852,7 +862,7 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -925,6 +935,13 @@ msgstr "デバイスは既に存在します: %s"
 msgid "Device: %s"
 msgstr "リモート名: %s"
 
+#: lxc/init.go:272
+#, fuzzy
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+"サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
+"した"
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr "このプラットフォーム上ではディレクトリのインポートは利用できません"
@@ -1057,7 +1074,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "環境変数を設定します (例: HOME=/home/foo)"
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr "Ephemeral コンテナ"
 
@@ -1425,7 +1442,7 @@ msgstr "コンテナのインポート中: %s"
 msgid "Input data"
 msgstr "入力するデータ"
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr "インスタンスタイプ"
 
@@ -2169,7 +2186,7 @@ msgstr "ネットワーク %s はメンバ %s 上でペンディング状態で
 msgid "Network %s renamed to %s"
 msgstr "ネットワーク名 %s を %s に変更しました"
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr "ネットワーク名:"
 
@@ -2388,7 +2405,7 @@ msgstr "プロファイル %s が %s から削除されました"
 msgid "Profile %s renamed to %s"
 msgstr "プロファイル名 %s を %s に変更しました"
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr "新しいコンテナに適用するプロファイル"
 
@@ -2644,7 +2661,7 @@ msgstr "スナップショットからストレージボリュームをリスト
 msgid "Retrieve the container's console log"
 msgstr "コンテナのコンソールログを取得します"
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr "イメージの取得中: %s"
@@ -2941,7 +2958,7 @@ msgstr "ストレージプール %s を削除しました"
 msgid "Storage pool %s pending on member %s"
 msgstr "ストレージプール %s はメンバ %s 上でペンディング状態です"
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr "ストレージプール名"
 
@@ -3026,7 +3043,7 @@ msgstr ""
 "コンテナは現在実行中です。停止して、再起動するために --force を使用してくださ"
 "い"
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr "起動しようとしたコンテナに接続されているネットワークがありません。"
 
@@ -3039,14 +3056,14 @@ msgstr "デバイスはすでに存在します"
 msgid "The device doesn't exist"
 msgstr "デバイスが存在しません"
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 "ローカルイメージ '%s' が見つかりません。代わりに '%s:%s' を試してみてくださ"
 "い。"
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -3087,12 +3104,12 @@ msgstr "コンテナを強制停止するまでの時間"
 msgid "Timestamps:"
 msgstr "タイムスタンプ:"
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 "コンテナにネットワークを接続するには、lxc network attach を使用してください"
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 "新しいネットワークを作成するには、lxc network create を使用してください"
@@ -3506,12 +3523,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-"サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
-"した"
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr "無効"
@@ -3665,9 +3676,10 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
-msgstr ""
+#: lxc/init.go:34
+#, fuzzy
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
+msgstr "delete [<remote>:]<image> [[<remote>:]<image>...]"
 
 #: lxc/launch.go:21
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
diff --git a/po/ko.po b/po/ko.po
index 5d1f2ff5d9..22b7696834 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/lxd.pot b/po/lxd.pot
index c9e85132ac..64b5110cfa 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2019-07-10 14:20-0400\n"
+        "POT-Creation-Date: 2019-07-15 17:37-0400\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -200,6 +200,10 @@ msgstr  ""
 msgid   "--container-only can't be passed when the source is a snapshot"
 msgstr  ""
 
+#: lxc/init.go:93
+msgid   "--empty cannot be combined with an image name"
+msgstr  ""
+
 #: lxc/copy.go:164
 msgid   "--refresh can only be used with containers"
 msgstr  ""
@@ -357,7 +361,7 @@ msgstr  ""
 msgid   "Bad key/value pair: %s"
 msgstr  ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176 lxc/storage.go:123 lxc/storage_volume.go:505
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176 lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid   "Bad key=value pair: %s"
 msgstr  ""
@@ -507,7 +511,7 @@ msgstr  ""
 msgid   "Client version: %s\n"
 msgstr  ""
 
-#: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570 lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48 lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732 lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188 lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591 lxc/storage.go:664 lxc/storage.go:747 lxc/storage_volume.go:306 lxc/storage_volume.go:466 lxc/storage_volume.go:543 lxc/storage_volume.go:785 lxc/storage_volume.go:982 lxc/storage_volume.go:1151 lxc/storage_volume.go:1181 lxc/storage_volume.go:1284 lxc/storage_volume.go:1367 lxc/storage_volume.go:1460
+#: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570 lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47 lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732 lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188 lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591 lxc/storage.go:664 lxc/storage.go:747 lxc/storage_volume.go:306 lxc/storage_volume.go:466 lxc/storage_volume.go:543 lxc/storage_volume.go:785 lxc/storage_volume.go:982 lxc/storage_volume.go:1151 lxc/storage_volume.go:1181 lxc/storage_volume.go:1284 lxc/storage_volume.go:1367 lxc/storage_volume.go:1460
 msgid   "Cluster member name"
 msgstr  ""
 
@@ -530,7 +534,7 @@ msgid   "Command line client for LXD\n"
         "For help with any of those, simply call them with --help."
 msgstr  ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid   "Config key/value to apply to the new container"
 msgstr  ""
 
@@ -555,7 +559,7 @@ msgstr  ""
 msgid   "Container name is mandatory"
 msgstr  ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid   "Container name is: %s"
 msgstr  ""
@@ -644,6 +648,10 @@ msgstr  ""
 msgid   "Create aliases for existing images"
 msgstr  ""
 
+#: lxc/init.go:49
+msgid   "Create an empty container"
+msgstr  ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid   "Create and start containers from images"
 msgstr  ""
@@ -663,7 +671,7 @@ msgid   "Create container snapshots\n"
         "running state, including process memory state, TCP connections, ..."
 msgstr  ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid   "Create containers from images"
 msgstr  ""
 
@@ -691,7 +699,7 @@ msgstr  ""
 msgid   "Create storage pools"
 msgstr  ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid   "Create the container with no profiles applied"
 msgstr  ""
 
@@ -700,12 +708,12 @@ msgstr  ""
 msgid   "Created: %s"
 msgstr  ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid   "Creating %s"
 msgstr  ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid   "Creating the container"
 msgstr  ""
 
@@ -778,7 +786,7 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147 lxc/alias.go:198 lxc/cluster.go:29 lxc/cluster.go:66 lxc/cluster.go:149 lxc/cluster.go:199 lxc/cluster.go:249 lxc/cluster.go:334 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:566 lxc/config.go:685 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:182 lxc/config_device.go:255 lxc/config_device.go:321 lxc/config_device.go:410 lxc/config_device.go:500 lxc/config_device.go:589 lxc/config_device.go:657 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:235 lxc/config_template.go:297 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:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31 lxc/file.go:42 lxc/file.go:75 lxc/file.go:124 lxc/file.go:187 lxc/file.go:377 lxc/image.go:41 lxc/image.go:130 lxc/image.go:264 lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792 lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35 lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110 lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378 lxc/network.go:463 lxc/network.go:548 lxc/network.go:671 lxc/network.go:729 lxc/network.go:809 lxc/network.go:929 lxc/network.go:1004 lxc/network.go:1054 lxc/network.go:1123 lxc/network.go:1185 lxc/operation.go:25 lxc/operation.go:54 lxc/operation.go:101 lxc/operation.go:186 lxc/profile.go:31 lxc/profile.go:103 lxc/profile.go:166 lxc/profile.go:246 lxc/profile.go:302 lxc/profile.go:356 lxc/profile.go:406 lxc/profile.go:530 lxc/profile.go:579 lxc/profile.go:677 lxc/profile.go:753 lxc/profile.go:803 lxc/profile.go:862 lxc/profile.go:916 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:382 lxc/project.go:471 lxc/project.go:526 lxc/project.go:586 lxc/project.go:615 lxc/project.go:668 lxc/publish.go:35 lxc/query.go:30 lxc/remote.go:37 lxc/remote.go:88 lxc/remote.go:416 lxc/remote.go:452 lxc/remote.go:568 lxc/remote.go:630 lxc/remote.go:680 lxc/remote.go:718 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:506 lxc/storage.go:588 lxc/storage.go:660 lxc/storage.go:744 lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219 lxc/storage_volume.go:302 lxc/storage_volume.go:463 lxc/storage_volume.go:540 lxc/storage_volume.go:616 lxc/storage_volume.go:698 lxc/storage_volume.go:779 lxc/storage_volume.go:979 lxc/storage_volume.go:1068 lxc/storage_volume.go:1147 lxc/storage_volume.go:1178 lxc/storage_volume.go:1281 lxc/storage_volume.go:1358 lxc/storage_volume.go:1457 lxc/storage_volume.go:1488 lxc/storage_volume.go:1559 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147 lxc/alias.go:198 lxc/cluster.go:29 lxc/cluster.go:66 lxc/cluster.go:149 lxc/cluster.go:199 lxc/cluster.go:249 lxc/cluster.go:334 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:566 lxc/config.go:685 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:182 lxc/config_device.go:255 lxc/config_device.go:321 lxc/config_device.go:410 lxc/config_device.go:500 lxc/config_device.go:589 lxc/config_device.go:657 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:235 lxc/config_template.go:297 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:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31 lxc/file.go:42 lxc/file.go:75 lxc/file.go:124 lxc/file.go:187 lxc/file.go:377 lxc/image.go:41 lxc/image.go:130 lxc/image.go:264 lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792 lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:36 lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110 lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378 lxc/network.go:463 lxc/network.go:548 lxc/network.go:671 lxc/network.go:729 lxc/network.go:809 lxc/network.go:929 lxc/network.go:1004 lxc/network.go:1054 lxc/network.go:1123 lxc/network.go:1185 lxc/operation.go:25 lxc/operation.go:54 lxc/operation.go:101 lxc/operation.go:186 lxc/profile.go:31 lxc/profile.go:103 lxc/profile.go:166 lxc/profile.go:246 lxc/profile.go:302 lxc/profile.go:356 lxc/profile.go:406 lxc/profile.go:530 lxc/profile.go:579 lxc/profile.go:677 lxc/profile.go:753 lxc/profile.go:803 lxc/profile.go:862 lxc/profile.go:916 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:382 lxc/project.go:471 lxc/project.go:526 lxc/project.go:586 lxc/project.go:615 lxc/project.go:668 lxc/publish.go:35 lxc/query.go:30 lxc/remote.go:37 lxc/remote.go:88 lxc/remote.go:416 lxc/remote.go:452 lxc/remote.go:568 lxc/remote.go:630 lxc/remote.go:680 lxc/remote.go:718 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:506 lxc/storage.go:588 lxc/storage.go:660 lxc/storage.go:744 lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:219 lxc/storage_volume.go:302 lxc/storage_volume.go:463 lxc/storage_volume.go:540 lxc/storage_volume.go:616 lxc/storage_volume.go:698 lxc/storage_volume.go:779 lxc/storage_volume.go:979 lxc/storage_volume.go:1068 lxc/storage_volume.go:1147 lxc/storage_volume.go:1178 lxc/storage_volume.go:1281 lxc/storage_volume.go:1358 lxc/storage_volume.go:1457 lxc/storage_volume.go:1488 lxc/storage_volume.go:1559 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -823,6 +831,10 @@ msgstr  ""
 msgid   "Device: %s"
 msgstr  ""
 
+#: lxc/init.go:272
+msgid   "Didn't get any affected image, container or snapshot from server"
+msgstr  ""
+
 #: lxc/image.go:593
 msgid   "Directory import is not available on this platform"
 msgstr  ""
@@ -937,7 +949,7 @@ msgstr  ""
 msgid   "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr  ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid   "Ephemeral container"
 msgstr  ""
 
@@ -1273,7 +1285,7 @@ msgstr  ""
 msgid   "Input data"
 msgstr  ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid   "Instance type"
 msgstr  ""
 
@@ -1870,7 +1882,7 @@ msgstr  ""
 msgid   "Network %s renamed to %s"
 msgstr  ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid   "Network name"
 msgstr  ""
 
@@ -2086,7 +2098,7 @@ msgstr  ""
 msgid   "Profile %s renamed to %s"
 msgstr  ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid   "Profile to apply to the new container"
 msgstr  ""
 
@@ -2331,7 +2343,7 @@ msgstr  ""
 msgid   "Retrieve the container's console log"
 msgstr  ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid   "Retrieving image: %s"
 msgstr  ""
@@ -2628,7 +2640,7 @@ msgstr  ""
 msgid   "Storage pool %s pending on member %s"
 msgstr  ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid   "Storage pool name"
 msgstr  ""
 
@@ -2708,7 +2720,7 @@ msgstr  ""
 msgid   "The container is currently running. Use --force to have it stopped and restarted"
 msgstr  ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid   "The container you are starting doesn't have any network attached to it."
 msgstr  ""
 
@@ -2720,12 +2732,12 @@ msgstr  ""
 msgid   "The device doesn't exist"
 msgstr  ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid   "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr  ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid   "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr  ""
@@ -2762,11 +2774,11 @@ msgstr  ""
 msgid   "Timestamps:"
 msgstr  ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid   "To attach a network to a container, use: lxc network attach"
 msgstr  ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid   "To create a new network, use: lxc network create"
 msgstr  ""
 
@@ -3154,10 +3166,6 @@ msgstr  ""
 msgid   "device"
 msgstr  ""
 
-#: lxc/init.go:233
-msgid   "didn't get any affected image, container or snapshot from server"
-msgstr  ""
-
 #: lxc/image.go:835
 msgid   "disabled"
 msgstr  ""
@@ -3304,8 +3312,8 @@ msgstr  ""
 msgid   "info [<remote>:][<container>]"
 msgstr  ""
 
-#: lxc/init.go:33
-msgid   "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid   "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr  ""
 
 #: lxc/launch.go:21
diff --git a/po/nb_NO.po b/po/nb_NO.po
index b18f1f948c..20b0d6289c 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/nl.po b/po/nl.po
index 73fdd62897..ee29184dbf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2019-02-26 09:18+0000\n"
 "Last-Translator: Heimen Stoffels <vistausss at outlook.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -257,6 +257,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -416,7 +420,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -569,7 +573,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -602,7 +606,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -629,7 +633,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -719,6 +723,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -739,7 +747,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -767,7 +775,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -776,12 +784,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -875,7 +883,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -948,6 +956,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1066,7 +1078,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1415,7 +1427,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2047,7 +2059,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2265,7 +2277,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2514,7 +2526,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2811,7 +2823,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2894,7 +2906,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2907,12 +2919,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2950,11 +2962,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3355,10 +3367,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3509,8 +3517,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/pa.po b/po/pa.po
index 3b1c42f79b..a17f5dab3d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/pl.po b/po/pl.po
index 9b976e8b77..bc05296bd5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2018-09-08 19:22+0000\n"
 "Last-Translator: m4sk1n <me at m4sk.in>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/linux-containers/"
@@ -257,6 +257,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -416,7 +420,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -569,7 +573,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -602,7 +606,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -629,7 +633,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -719,6 +723,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -739,7 +747,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -767,7 +775,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -776,12 +784,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -875,7 +883,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -948,6 +956,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1066,7 +1078,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1415,7 +1427,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2047,7 +2059,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2265,7 +2277,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2514,7 +2526,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2811,7 +2823,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2894,7 +2906,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2907,12 +2919,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2950,11 +2962,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3355,10 +3367,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3509,8 +3517,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 08c2436c7a..116a3c3c51 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2019-06-22 17:19+0000\n"
 "Last-Translator: Renato dos Santos <shazaum at gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -327,6 +327,11 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr "--container-only não pode ser passado quando a fonte é um snapshot"
 
+#: lxc/init.go:93
+#, fuzzy
+msgid "--empty cannot be combined with an image name"
+msgstr "--refresh só pode ser usado com containers"
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr "--refresh só pode ser usado com containers"
@@ -487,7 +492,7 @@ msgstr "Backup exportado com sucesso!"
 msgid "Bad key/value pair: %s"
 msgstr "par de chave/valor inválido %s"
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -641,7 +646,7 @@ msgid "Client version: %s\n"
 msgstr "Versão do cliente: %s\n"
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -679,7 +684,7 @@ msgstr ""
 "abaixo.\n"
 "Para obter ajuda com qualquer um desses, simplesmente use-os com --help."
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 
@@ -706,7 +711,7 @@ msgstr "Log de Console:"
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -796,6 +801,10 @@ msgstr "Impossível criar diretório para certificado do servidor"
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -820,7 +829,7 @@ msgstr ""
 "Quando --stateful é usado, o LXD tenta criar um checkpoint do estado atual \n"
 "do container, incluindo estado de memória dos processos, conexões TCP, ..."
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -848,7 +857,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -857,12 +866,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -956,7 +965,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -1029,6 +1038,10 @@ msgstr "O dispositivo já existe: %s"
 msgid "Device: %s"
 msgstr "Em cache: %s"
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr "A importação de diretório não está disponível nessa plataforma"
@@ -1150,7 +1163,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1500,7 +1513,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2132,7 +2145,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2350,7 +2363,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2599,7 +2612,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2897,7 +2910,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,7 +2993,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2993,12 +3006,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -3036,11 +3049,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3442,10 +3455,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3596,8 +3605,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/ru.po b/po/ru.po
index 4b82b5b232..839b58b63d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2018-06-22 15:57+0000\n"
 "Last-Translator: Александр Киль <shorrey at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -318,6 +318,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -479,7 +483,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -634,7 +638,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -667,7 +671,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -694,7 +698,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr "Имя контейнера является обязательным"
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr "Имя контейнера: %s"
@@ -785,6 +789,11 @@ msgstr "Не удалось создать каталог сертификата
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+#, fuzzy
+msgid "Create an empty container"
+msgstr "Невозможно добавить имя контейнера в список"
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -806,7 +815,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -837,7 +846,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr "Копирование образа: %s"
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 #, fuzzy
 msgid "Create the container with no profiles applied"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -847,12 +856,12 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -949,7 +958,7 @@ msgstr "Копирование образа: %s"
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -1022,6 +1031,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1144,7 +1157,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1499,7 +1512,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2143,7 +2156,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2363,7 +2376,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2618,7 +2631,7 @@ msgstr "Копирование образа: %s"
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2919,7 +2932,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -3003,7 +3016,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -3016,12 +3029,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -3059,11 +3072,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3485,10 +3498,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3659,9 +3668,13 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+#, fuzzy
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
 #: lxc/launch.go:21
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
diff --git a/po/sr.po b/po/sr.po
index 30f450eec4..53f35ebaa0 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/sv.po b/po/sv.po
index ecd7b03899..d008cabd52 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/tr.po b/po/tr.po
index c9dfac1e4f..e9a8c44c65 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/uk.po b/po/uk.po
index bd13605a2e..91114a7b68 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,6 +208,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -367,7 +371,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +524,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -553,7 +557,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -580,7 +584,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -670,6 +674,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -690,7 +698,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -718,7 +726,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -727,12 +735,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -826,7 +834,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -899,6 +907,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1017,7 +1029,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -1998,7 +2010,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2216,7 +2228,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2762,7 +2774,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2858,12 +2870,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2901,11 +2913,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3306,10 +3318,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3460,8 +3468,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index fe247bcf62..7241ff3ed2 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-07-09 17:29-0400\n"
+"POT-Creation-Date: 2019-07-15 17:37-0400\n"
 "PO-Revision-Date: 2018-09-11 19:15+0000\n"
 "Last-Translator: 0x0916 <w at laoqinren.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -211,6 +211,10 @@ msgstr ""
 msgid "--container-only can't be passed when the source is a snapshot"
 msgstr ""
 
+#: lxc/init.go:93
+msgid "--empty cannot be combined with an image name"
+msgstr ""
+
 #: lxc/copy.go:164
 msgid "--refresh can only be used with containers"
 msgstr ""
@@ -370,7 +374,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:124 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:149 lxc/project.go:121 lxc/publish.go:176
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -523,7 +527,7 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:96 lxc/config.go:376 lxc/config.go:466 lxc/config.go:570
-#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:48
+#: lxc/config.go:688 lxc/copy.go:52 lxc/info.go:44 lxc/init.go:47
 #: lxc/move.go:58 lxc/network.go:259 lxc/network.go:674 lxc/network.go:732
 #: lxc/network.go:1057 lxc/network.go:1126 lxc/network.go:1188
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:591
@@ -556,7 +560,7 @@ msgid ""
 "For help with any of those, simply call them with --help."
 msgstr ""
 
-#: lxc/copy.go:44 lxc/init.go:42
+#: lxc/copy.go:44 lxc/init.go:41
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
@@ -583,7 +587,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:415 lxc/init.go:239
+#: lxc/copy.go:415 lxc/init.go:278
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -673,6 +677,10 @@ msgstr ""
 msgid "Create aliases for existing images"
 msgstr ""
 
+#: lxc/init.go:49
+msgid "Create an empty container"
+msgstr ""
+
 #: lxc/launch.go:22 lxc/launch.go:23
 msgid "Create and start containers from images"
 msgstr ""
@@ -693,7 +701,7 @@ msgid ""
 "running state, including process memory state, TCP connections, ..."
 msgstr ""
 
-#: lxc/init.go:34 lxc/init.go:35
+#: lxc/init.go:35 lxc/init.go:36
 msgid "Create containers from images"
 msgstr ""
 
@@ -721,7 +729,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:54 lxc/init.go:49
+#: lxc/copy.go:54 lxc/init.go:48
 msgid "Create the container with no profiles applied"
 msgstr ""
 
@@ -730,12 +738,12 @@ msgstr ""
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:103
+#: lxc/init.go:128
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:101
+#: lxc/init.go:126
 msgid "Creating the container"
 msgstr ""
 
@@ -829,7 +837,7 @@ msgstr ""
 #: lxc/image.go:315 lxc/image.go:438 lxc/image.go:578 lxc/image.go:792
 #: lxc/image.go:906 lxc/image.go:1236 lxc/image.go:1313 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/import.go:28 lxc/info.go:32 lxc/init.go:35
+#: lxc/image_alias.go:250 lxc/import.go:28 lxc/info.go:32 lxc/init.go:36
 #: lxc/launch.go:23 lxc/list.go:48 lxc/main.go:50 lxc/manpage.go:19
 #: lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:34 lxc/network.go:110
 #: lxc/network.go:183 lxc/network.go:256 lxc/network.go:328 lxc/network.go:378
@@ -902,6 +910,10 @@ msgstr ""
 msgid "Device: %s"
 msgstr ""
 
+#: lxc/init.go:272
+msgid "Didn't get any affected image, container or snapshot from server"
+msgstr ""
+
 #: lxc/image.go:593
 msgid "Directory import is not available on this platform"
 msgstr ""
@@ -1020,7 +1032,7 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:44
+#: lxc/copy.go:47 lxc/init.go:43
 msgid "Ephemeral container"
 msgstr ""
 
@@ -1369,7 +1381,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/init.go:47
+#: lxc/init.go:46
 msgid "Instance type"
 msgstr ""
 
@@ -2001,7 +2013,7 @@ msgstr ""
 msgid "Network %s renamed to %s"
 msgstr ""
 
-#: lxc/init.go:45
+#: lxc/init.go:44
 msgid "Network name"
 msgstr ""
 
@@ -2219,7 +2231,7 @@ msgstr ""
 msgid "Profile %s renamed to %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:43
+#: lxc/copy.go:46 lxc/init.go:42
 msgid "Profile to apply to the new container"
 msgstr ""
 
@@ -2468,7 +2480,7 @@ msgstr ""
 msgid "Retrieve the container's console log"
 msgstr ""
 
-#: lxc/init.go:208
+#: lxc/init.go:235
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
@@ -2765,7 +2777,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:46 lxc/move.go:57
+#: lxc/copy.go:51 lxc/import.go:35 lxc/init.go:45 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2848,7 +2860,7 @@ msgid ""
 "restarted"
 msgstr ""
 
-#: lxc/init.go:290
+#: lxc/init.go:329
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
@@ -2861,12 +2873,12 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:274
+#: lxc/init.go:313
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:%s' instead."
 msgstr ""
 
-#: lxc/init.go:270
+#: lxc/init.go:309
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -2904,11 +2916,11 @@ msgstr ""
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:292
+#: lxc/init.go:331
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:291
+#: lxc/init.go:330
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -3309,10 +3321,6 @@ msgstr ""
 msgid "device"
 msgstr ""
 
-#: lxc/init.go:233
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
 #: lxc/image.go:835
 msgid "disabled"
 msgstr ""
@@ -3463,8 +3471,8 @@ msgstr ""
 msgid "info [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/init.go:33
-msgid "init [<remote>:]<image> [<remote>:][<name>]"
+#: lxc/init.go:34
+msgid "init [[<remote>:]<image>] [<remote>:][<name>]"
 msgstr ""
 
 #: lxc/launch.go:21


More information about the lxc-devel mailing list