[lxc-devel] [lxd/master] lxc/remote: Better handle remotes with no name

stgraber on Github lxc-bot at linuxcontainers.org
Tue Mar 17 00:25:37 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200316/4df6464c/attachment-0001.bin>
-------------- next part --------------
From fcdbf51434d60ea5e1004fe3fd21cc5fc006a165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 16 Mar 2020 20:22:56 -0400
Subject: [PATCH 1/3] lxc/remote: Use helpers
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/remote.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lxc/remote.go b/lxc/remote.go
index 7cda0be464..02c237ad90 100644
--- a/lxc/remote.go
+++ b/lxc/remote.go
@@ -7,7 +7,6 @@ import (
 	"net"
 	"net/url"
 	"os"
-	"path/filepath"
 	"sort"
 	"strings"
 
@@ -274,7 +273,7 @@ func (c *cmdRemoteAdd) Run(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf(i18n.G("Could not create server cert dir"))
 		}
 
-		certf := fmt.Sprintf("%s/%s.crt", dnam, server)
+		certf := conf.ServerCertPath(server)
 		certOut, err := os.Create(certf)
 		if err != nil {
 			return err
@@ -564,8 +563,8 @@ func (c *cmdRemoteRename) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Rename the certificate file
-	oldPath := filepath.Join(conf.ConfigPath("servercerts"), fmt.Sprintf("%s.crt", args[0]))
-	newPath := filepath.Join(conf.ConfigPath("servercerts"), fmt.Sprintf("%s.crt", args[1]))
+	oldPath := conf.ServerCertPath(args[0])
+	newPath := conf.ServerCertPath(args[1])
 	if shared.PathExists(oldPath) {
 		err := os.Rename(oldPath, newPath)
 		if err != nil {

From 0664bf002a3f613623b339fca4ce8ae537f8e11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 16 Mar 2020 20:24:28 -0400
Subject: [PATCH 2/3] lxc/remote: Validate remote name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #6951

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

diff --git a/lxc/remote.go b/lxc/remote.go
index 02c237ad90..9b9b1bc110 100644
--- a/lxc/remote.go
+++ b/lxc/remote.go
@@ -117,6 +117,11 @@ func (c *cmdRemoteAdd) Run(cmd *cobra.Command, args []string) error {
 		addr = args[1]
 	}
 
+	// Validate the server name.
+	if strings.Contains(server, ":") {
+		return fmt.Errorf(i18n.G("Remote names may not contain colons"))
+	}
+
 	// Check for existing remote
 	remote, ok := conf.Remotes[server]
 	if ok {

From f7d48989738e6cfbf697a6c3d5ca4c7a303cf874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 16 Mar 2020 20:24:49 -0400
Subject: [PATCH 3/3] i18n: Update translation templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/po/bg.po b/po/bg.po
index f33f71b2a2..66756a9cc5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 9423468a1b..5671cd8f34 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: 2019-12-12 14:53+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -136,7 +136,7 @@ msgstr ""
 "### Zum Beispiel:\n"
 "###  description: Mein eigenes Abbild\n"
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 #, fuzzy
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
@@ -365,11 +365,11 @@ msgstr "ALIASES"
 msgid "ARCHITECTURE"
 msgstr "ARCHITEKTUR"
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr "Akzeptiere Zertifikat"
 
@@ -387,11 +387,11 @@ msgstr "Geräte zu Containern oder Profilen hinzufügen"
 msgid "Add new aliases"
 msgstr "Aliasse:\n"
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr "Neue entfernte Server hinzufügen"
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -403,7 +403,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -417,7 +417,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Address: %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, fuzzy, c-format
 msgid "Admin password for %s:"
 msgstr "Administrator Passwort für %s: "
@@ -496,7 +496,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -525,7 +525,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -562,7 +562,7 @@ msgstr "Bytes gesendet"
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -634,7 +634,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -659,7 +659,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -677,12 +677,12 @@ msgstr ""
 "Optionen:\n"
 "\n"
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, fuzzy, c-format
 msgid "Certificate fingerprint: %s"
 msgstr "Fingerabdruck des Zertifikats: % x\n"
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 #, fuzzy
 msgid "Client certificate stored at server:"
 msgstr "Gespeichertes Nutzerzertifikat auf dem Server: "
@@ -706,7 +706,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -741,7 +741,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Config key/value to apply to the target instance"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, fuzzy, c-format
@@ -838,7 +838,7 @@ msgstr "Fehler: %v\n"
 msgid "Cores:"
 msgstr "Fehler: %v\n"
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 
@@ -888,7 +888,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Create new custom storage volumes"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 #, fuzzy
 msgid "Create new instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -958,7 +958,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 #, fuzzy
 msgid "Delete instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -1014,17 +1014,17 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -1045,9 +1045,9 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1169,7 +1169,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr "ABLAUFDATUM"
 
@@ -1188,12 +1188,12 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 #, fuzzy
 msgid "Edit instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 #, fuzzy
 msgid "Edit instance metadata files"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -1228,11 +1228,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1256,7 +1256,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr "Flüchtiger Container"
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, fuzzy, c-format
 msgid "Error updating template file: %s"
 msgstr "Fehler beim hinzufügen des Alias %s\n"
@@ -1328,11 +1328,11 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr "FINGERABDRUCK"
@@ -1423,10 +1423,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1458,7 +1458,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 #, fuzzy
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "Generiere Nutzerzertifikat. Dies kann wenige Minuten dauern...\n"
@@ -1540,7 +1540,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1622,7 +1622,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1631,7 +1631,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, fuzzy, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
@@ -1640,12 +1640,12 @@ msgstr "Abbild mit Fingerabdruck %s importiert\n"
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 #, fuzzy
 msgid "Invalid certificate"
 msgstr "Akzeptiere Zertifikat"
@@ -1691,7 +1691,7 @@ msgstr "ungültiges Argument %s"
 msgid "Invalid path %s"
 msgstr "Ungültiges Ziel %s"
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, fuzzy, c-format
 msgid "Invalid protocol: %s"
 msgstr "Ungültiges Ziel %s"
@@ -1831,7 +1831,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 #, fuzzy
 msgid "List instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -1936,11 +1936,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1992,7 +1992,7 @@ msgstr ""
 msgid "Make image public"
 msgstr "Veröffentliche Abbild"
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 #, fuzzy
 msgid "Make the image public"
 msgstr "Veröffentliche Abbild"
@@ -2054,12 +2054,12 @@ msgstr "Alternatives config Verzeichnis."
 msgid "Manage instance devices"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 #, fuzzy
 msgid "Manage instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 #, fuzzy
 msgid "Manage instance metadata files"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -2092,11 +2092,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -2143,10 +2143,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 #, fuzzy
 msgid "Missing instance name"
@@ -2269,7 +2269,7 @@ msgid "Must supply instance name for: "
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2283,7 +2283,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2344,7 +2344,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2393,7 +2393,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2435,11 +2435,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2488,8 +2488,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2604,7 +2604,7 @@ msgstr "Profil %s wurde auf %s angewandt\n"
 msgid "Properties:"
 msgstr "Eigenschaften:\n"
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2613,12 +2613,12 @@ msgstr ""
 msgid "Public: %s"
 msgstr "Öffentlich: %s\n"
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 #, fuzzy
 msgid "Publish instances as images"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, fuzzy, c-format
 msgid "Publishing instance: %s"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -2670,31 +2670,35 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, fuzzy, c-format
 msgid "Remote %s already exists"
 msgstr "entfernte Instanz %s existiert bereits"
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, fuzzy, c-format
 msgid "Remote %s doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, fuzzy, c-format
 msgid "Remote %s exists as <%s>"
 msgstr "entfernte Instanz %s existiert als <%s>"
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr "Entferntes Administrator Passwort"
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 #, fuzzy
 msgid "Remote operation canceled by user"
@@ -2734,11 +2738,11 @@ msgstr "Anhalten des Containers fehlgeschlagen!"
 msgid "Remove profiles from instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2770,7 +2774,7 @@ msgstr "Fehlerhafte Profil URL %s"
 msgid "Rename projects"
 msgstr "Fehlerhafte Profil URL %s"
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2865,7 +2869,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2885,21 +2889,21 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr "Server Zertifikat vom Benutzer nicht akzeptiert"
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 #, fuzzy
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 "Der Server vertraut uns nicht nachdem er unser Zertifikat hinzugefügt hat"
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -3013,7 +3017,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -3037,7 +3041,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 #, fuzzy
 msgid "Show content of instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -3059,7 +3063,7 @@ msgstr "Geräte zu Containern oder Profilen hinzufügen"
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 #, fuzzy
 msgid "Show instance metadata files"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -3108,7 +3112,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Show storage volume configurations"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -3199,11 +3203,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 #, fuzzy
 msgid "Stopping instance failed!"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -3280,7 +3284,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3320,7 +3324,7 @@ msgstr "entfernte Instanz %s existiert nicht"
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3360,7 +3364,7 @@ msgstr "entfernte Instanz %s existiert nicht"
 msgid "The specified device doesn't match the network"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3462,7 +3466,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3621,7 +3625,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr "Zustand des laufenden Containers sichern oder nicht"
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3648,7 +3652,7 @@ msgstr "der Name des Ursprung Containers muss angegeben werden"
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3669,7 +3673,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3742,7 +3746,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 #, fuzzy
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
@@ -3774,7 +3778,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3790,7 +3794,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 #, fuzzy
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 #, fuzzy
 msgid "edit [<remote>:]<instance>"
 msgstr ""
@@ -3906,7 +3910,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 #, fuzzy
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
@@ -3958,7 +3962,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4042,7 +4046,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -4097,11 +4101,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -4114,7 +4118,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr ""
@@ -4369,7 +4373,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -4403,7 +4407,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 #, fuzzy
 msgid "ok (y/n)?"
 msgstr "OK (y/n)? "
@@ -4442,7 +4446,7 @@ msgstr "Profil %s erstellt\n"
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 #, fuzzy
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
@@ -4485,7 +4489,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -4493,11 +4497,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4525,7 +4529,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4647,7 +4651,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4655,7 +4659,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr ""
@@ -4664,7 +4668,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 #, fuzzy
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
@@ -4774,7 +4778,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4791,7 +4795,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4799,7 +4803,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4859,7 +4863,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 209e3a8593..df8934782a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-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/"
@@ -81,7 +81,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -236,11 +236,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -256,11 +256,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -272,7 +272,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -358,7 +358,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -386,7 +386,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -423,7 +423,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -485,7 +485,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -510,7 +510,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -524,12 +524,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -584,7 +584,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -719,7 +719,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -783,7 +783,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -803,7 +803,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -834,17 +834,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -865,9 +865,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -981,7 +981,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -999,11 +999,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1036,11 +1036,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1063,7 +1063,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1129,11 +1129,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1218,10 +1218,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1253,7 +1253,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1331,7 +1331,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1411,7 +1411,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1420,7 +1420,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1429,12 +1429,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1478,7 +1478,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1612,7 +1612,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1699,11 +1699,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1751,7 +1751,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1806,11 +1806,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1838,11 +1838,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1891,10 +1891,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -2006,7 +2006,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2020,7 +2020,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2081,7 +2081,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr "  Χρήση δικτύου:"
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2127,7 +2127,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2169,11 +2169,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2221,8 +2221,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2332,7 +2332,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2341,11 +2341,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2395,31 +2395,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2455,11 +2459,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2488,7 +2492,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2577,7 +2581,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2597,19 +2601,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2718,7 +2722,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2742,7 +2746,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2762,7 +2766,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2806,7 +2810,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2893,11 +2897,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2969,7 +2973,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3007,7 +3011,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3044,7 +3048,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3144,7 +3148,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3288,7 +3292,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3312,7 +3316,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3324,7 +3328,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3388,7 +3392,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3416,7 +3420,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3428,7 +3432,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3502,11 +3506,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3538,7 +3542,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3601,7 +3605,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3647,11 +3651,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3664,7 +3668,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3907,7 +3911,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3936,7 +3940,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3964,7 +3968,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3989,7 +3993,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3997,11 +4001,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4021,7 +4025,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4095,7 +4099,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4103,11 +4107,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4179,7 +4183,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4192,7 +4196,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4200,7 +4204,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4248,7 +4252,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 9009ebba0c..fb953603e8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -136,7 +136,7 @@ msgstr ""
 "### Un ejemplo sería:\n"
 "###  description: My custom image"
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 #, fuzzy
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
@@ -358,11 +358,11 @@ msgstr "ALIASES"
 msgid "ARCHITECTURE"
 msgstr "ARQUITECTURA"
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr "Acepta certificado"
 
@@ -379,11 +379,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr "Aliases:"
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -395,7 +395,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -408,7 +408,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr "Expira: %s"
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, fuzzy, c-format
 msgid "Admin password for %s:"
 msgstr "Contraseña admin para %s: "
@@ -481,7 +481,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr "Tipo de autenticación %s no está soportada por el servidor"
@@ -509,7 +509,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -547,7 +547,7 @@ msgstr "Bytes enviados"
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr "NOMBRE COMÚN"
 
@@ -609,7 +609,7 @@ msgstr "No se puede jalar un directorio sin - recursivo"
 msgid "Can't read from stdin: %s"
 msgstr "No se peude leer desde stdin: %s"
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -635,7 +635,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -649,12 +649,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr "Cacheado: %s"
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr "Certificado de la huella digital: %s"
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 #, fuzzy
 msgid "Client certificate stored at server:"
 msgstr "Certificado del cliente almacenado en el servidor: "
@@ -678,7 +678,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr "Nombre del Miembro del Cluster"
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr "Perfil para aplicar al nuevo contenedor"
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -805,7 +805,7 @@ msgstr "Expira: %s"
 msgid "Cores:"
 msgstr "Expira: %s"
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -852,7 +852,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -917,7 +917,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -937,7 +937,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -969,17 +969,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -1000,9 +1000,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1115,7 +1115,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr "FECHA DE EXPIRACIÓN"
 
@@ -1133,11 +1133,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1170,11 +1170,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1197,7 +1197,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr "Error actualizando el archivo de plantilla: %s"
@@ -1265,11 +1265,11 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "Exporting the image: %s"
 msgstr "Exportando la imagen: %s"
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr "HUELLA DIGITAL"
@@ -1355,10 +1355,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1390,7 +1390,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1468,7 +1468,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1549,7 +1549,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 #, fuzzy
 msgid "Instance name is mandatory"
 msgstr "Nombre del contenedor es obligatorio"
@@ -1559,7 +1559,7 @@ msgstr "Nombre del contenedor es obligatorio"
 msgid "Instance name is: %s"
 msgstr "Nombre del contenedor es: %s"
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, fuzzy, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr "Contenedor publicado con huella digital: %s"
@@ -1568,12 +1568,12 @@ msgstr "Contenedor publicado con huella digital: %s"
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1617,7 +1617,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1840,11 +1840,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1892,7 +1892,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1947,11 +1947,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1979,11 +1979,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -2030,10 +2030,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 #, fuzzy
 msgid "Missing instance name"
@@ -2148,7 +2148,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2162,7 +2162,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2222,7 +2222,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2268,7 +2268,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2310,11 +2310,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2362,8 +2362,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2476,7 +2476,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2485,11 +2485,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr "Público: %s"
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, fuzzy, c-format
 msgid "Publishing instance: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -2539,31 +2539,35 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "Refreshing the image: %s"
 msgstr "Refrescando la imagen: %s"
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2599,11 +2603,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2633,7 +2637,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2723,7 +2727,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2743,19 +2747,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2864,7 +2868,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2888,7 +2892,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2908,7 +2912,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2952,7 +2956,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -3039,11 +3043,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -3115,7 +3119,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3153,7 +3157,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3190,7 +3194,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3290,7 +3294,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3434,7 +3438,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3458,7 +3462,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3472,7 +3476,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3537,7 +3541,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 #, fuzzy
 msgid "create [<remote>:]<instance> <template>"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -3566,7 +3570,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3578,7 +3582,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 #, fuzzy
 msgid "delete [<remote>:]<instance> <template>"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -3654,12 +3658,12 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 #, fuzzy
 msgid "edit [<remote>:]<instance>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 #, fuzzy
 msgid "edit [<remote>:]<instance> <template>"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -3694,7 +3698,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3759,7 +3763,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3806,11 +3810,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3823,7 +3827,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -4068,7 +4072,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -4098,7 +4102,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -4128,7 +4132,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -4153,7 +4157,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -4161,11 +4165,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4187,7 +4191,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4266,7 +4270,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4274,12 +4278,12 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 #, fuzzy
 msgid "show [<remote>:]<instance> <template>"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -4357,7 +4361,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4371,7 +4375,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4379,7 +4383,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4430,7 +4434,7 @@ msgstr ""
 msgid "volume"
 msgstr "Columnas"
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 70c3cc6a7c..3811a4d1ae 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 6b68855d26..79debb1f89 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 2e5af15312..885e8583a7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-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/"
@@ -132,7 +132,7 @@ msgstr ""
 "### Un exemple serait :\n"
 "###  description: Mon image personnalisée"
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 #, fuzzy
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
@@ -358,12 +358,12 @@ msgstr "ALIAS"
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTURE"
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 #, fuzzy
 msgid "AUTH TYPE"
 msgstr "TYPE"
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr "Accepter le certificat"
 
@@ -380,11 +380,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr "Alias :"
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -396,7 +396,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -410,7 +410,7 @@ msgstr "Création du conteneur"
 msgid "Address: %s"
 msgstr "Expire : %s"
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, fuzzy, c-format
 msgid "Admin password for %s:"
 msgstr "Mot de passe administrateur pour %s : "
@@ -487,7 +487,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr "Le type d'authentification '%s' n'est pas supporté par le serveur"
@@ -516,7 +516,7 @@ msgstr "Image copiée avec succès !"
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -553,7 +553,7 @@ msgstr "Octets émis"
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr "COMMON NAME"
 
@@ -617,7 +617,7 @@ msgstr "impossible de récupérer un répertoire sans --recursive"
 msgid "Can't read from stdin: %s"
 msgstr "Impossible de lire depuis stdin : %s"
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 #, fuzzy
 msgid "Can't remove the default remote"
 msgstr "impossible de supprimer le serveur distant par défaut"
@@ -645,7 +645,7 @@ msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 "Impossible de désaffecter la clé '%s', elle n'est pas définie actuellement."
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -659,12 +659,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr "Créé : %s"
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr "Empreinte du certificat : %s"
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 #, fuzzy
 msgid "Client certificate stored at server:"
 msgstr "Certificat client enregistré sur le serveur : "
@@ -688,7 +688,7 @@ msgstr "Afficher la version du client"
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -729,7 +729,7 @@ msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 msgid "Config key/value to apply to the target instance"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -827,7 +827,7 @@ msgstr "erreur : %v"
 msgid "Cores:"
 msgstr "erreur : %v"
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 
@@ -893,7 +893,7 @@ msgstr "Création du conteneur"
 msgid "Create new custom storage volumes"
 msgstr "Copie de l'image : %s"
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 #, fuzzy
 msgid "Create new instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -964,7 +964,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr "Définir un algorithme de compression : pour image ou aucun"
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr "Définir un algorithme de compression : pour image ou aucun"
 
@@ -986,7 +986,7 @@ msgstr ""
 msgid "Delete images"
 msgstr "Récupération de l'image : %s"
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 #, fuzzy
 msgid "Delete instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -1021,17 +1021,17 @@ msgstr "Copie de l'image : %s"
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -1052,9 +1052,9 @@ msgstr "Copie de l'image : %s"
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1171,7 +1171,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr "ÉPHÉMÈRE"
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr "DATE D'EXPIRATION"
 
@@ -1190,12 +1190,12 @@ msgstr "Création du conteneur"
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 #, fuzzy
 msgid "Edit instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 #, fuzzy
 msgid "Edit instance metadata files"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -1231,11 +1231,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1259,7 +1259,7 @@ msgstr "Variable d'environnement (de la forme HOME=/home/foo) à positionner"
 msgid "Ephemeral instance"
 msgstr "Conteneur éphémère"
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr "Erreur de mise à jour du modèle de fichier : %s"
@@ -1337,12 +1337,12 @@ msgstr "Import de l'image : %s"
 msgid "Exporting the image: %s"
 msgstr "Import de l'image : %s"
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 #, fuzzy
 msgid "FILENAME"
 msgstr "NOM"
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
@@ -1432,10 +1432,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1467,7 +1467,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "Génération d'un certificat client. Ceci peut prendre une minute…"
 
@@ -1552,7 +1552,7 @@ msgstr "IPv4"
 msgid "IPV6"
 msgstr "IPv6"
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr "DATE D'ÉMISSION"
 
@@ -1640,7 +1640,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 #, fuzzy
 msgid "Instance name is mandatory"
 msgstr "Le nom du conteneur est obligatoire"
@@ -1650,7 +1650,7 @@ msgstr "Le nom du conteneur est obligatoire"
 msgid "Instance name is: %s"
 msgstr "Le nom du conteneur est : %s"
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, fuzzy, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr "Conteneur publié avec l'empreinte : %s"
@@ -1659,12 +1659,12 @@ msgstr "Conteneur publié avec l'empreinte : %s"
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr "Schème d'URL invalide \"%s\" in \"%s\""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
@@ -1709,7 +1709,7 @@ msgstr "nombre d'arguments incorrect pour la sous-comande"
 msgid "Invalid path %s"
 msgstr "Cible invalide %s"
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, fuzzy, c-format
 msgid "Invalid protocol: %s"
 msgstr "Cible invalide %s"
@@ -1845,7 +1845,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr "Création du conteneur"
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 #, fuzzy
 msgid "List instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -1995,11 +1995,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr "Copie de l'image : %s"
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -2047,7 +2047,7 @@ msgstr ""
 msgid "Make image public"
 msgstr "Rendre l'image publique"
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr "Rendre l'image publique"
 
@@ -2107,12 +2107,12 @@ msgstr "Clé de configuration invalide"
 msgid "Manage instance devices"
 msgstr "Création du conteneur"
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 #, fuzzy
 msgid "Manage instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 #, fuzzy
 msgid "Manage instance metadata files"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -2144,11 +2144,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -2198,10 +2198,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 #, fuzzy
 msgid "Missing instance name"
@@ -2327,7 +2327,7 @@ msgid "Must supply instance name for: "
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr "NOM"
@@ -2341,7 +2341,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr "NON"
 
@@ -2402,7 +2402,7 @@ msgstr "Nom du réseau"
 msgid "Network usage:"
 msgstr "  Réseau utilisé :"
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr "Nouvel alias à définir sur la cible"
 
@@ -2455,7 +2455,7 @@ msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 "Seuls les volumes \"personnalisés\" peuvent être attachés aux conteneurs."
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr "Seules les URLs https sont supportées par simplestreams"
 
@@ -2500,11 +2500,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr "PROFILS"
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr "PROTOCOLE"
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr "PUBLIC"
 
@@ -2554,8 +2554,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr "Appuyer sur Entrée pour lancer à nouveau l'éditeur"
 
@@ -2669,7 +2669,7 @@ msgstr "Profil %s ajouté à %s"
 msgid "Properties:"
 msgstr "Propriétés :"
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr "Serveur d'images public"
 
@@ -2678,12 +2678,12 @@ msgstr "Serveur d'images public"
 msgid "Public: %s"
 msgstr "Public : %s"
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 #, fuzzy
 msgid "Publish instances as images"
 msgstr "Création du conteneur"
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, fuzzy, c-format
 msgid "Publishing instance: %s"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
@@ -2737,31 +2737,35 @@ msgstr "Ignorer l'état du conteneur (seulement pour start)"
 msgid "Refreshing the image: %s"
 msgstr "Récupération de l'image : %s"
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, fuzzy, c-format
 msgid "Remote %s already exists"
 msgstr "le serveur distant %s existe déjà"
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, fuzzy, c-format
 msgid "Remote %s doesn't exist"
 msgstr "le serveur distant %s n'existe pas"
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, fuzzy, c-format
 msgid "Remote %s exists as <%s>"
 msgstr "le serveur distant %s existe en tant que <%s>"
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, fuzzy, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr "le serveur distant %s est statique et ne peut être modifié"
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr "Mot de passe de l'administrateur distant"
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 #, fuzzy
 msgid "Remote operation canceled by user"
@@ -2801,11 +2805,11 @@ msgstr "L'arrêt du conteneur a échoué !"
 msgid "Remove profiles from instances"
 msgstr "Création du conteneur"
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2836,7 +2840,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr "Créé : %s"
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2932,7 +2936,7 @@ msgstr ""
 msgid "STATE"
 msgstr "ÉTAT"
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr "STATIQUE"
 
@@ -2954,21 +2958,21 @@ msgstr "ENSEMBLE DE STOCKAGE"
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr "Certificat serveur rejeté par l'utilisateur"
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 #, fuzzy
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 "Le serveur ne nous fait pas confiance après l'ajout de notre certificat"
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr "Protocole du serveur (lxd ou simplestreams)"
 
@@ -3084,7 +3088,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -3108,7 +3112,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 #, fuzzy
 msgid "Show content of instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -3129,7 +3133,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 #, fuzzy
 msgid "Show instance metadata files"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -3183,7 +3187,7 @@ msgstr "Afficher la configuration étendue"
 msgid "Show storage volume configurations"
 msgstr "Afficher la configuration étendue"
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 #, fuzzy
 msgid "Show the default remote"
 msgstr "impossible de supprimer le serveur distant par défaut"
@@ -3275,12 +3279,12 @@ msgstr "État : %s"
 msgid "Stop instances"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 #, fuzzy
 msgid "Stop the instance if currently running"
 msgstr "Arrêter le conteneur s'il est en cours d'exécution"
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 #, fuzzy
 msgid "Stopping instance failed!"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -3357,7 +3361,7 @@ msgstr "Swap (pointe)"
 msgid "Switch the current project"
 msgstr "impossible de supprimer le serveur distant par défaut"
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 #, fuzzy
 msgid "Switch the default remote"
 msgstr "impossible de supprimer le serveur distant par défaut"
@@ -3399,7 +3403,7 @@ msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 "Le conteneur est en cours d'exécution, l'arrêter d'abord ou ajouter --force."
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 #, fuzzy
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
@@ -3442,7 +3446,7 @@ msgstr "Le périphérique indiqué n'existe pas"
 msgid "The specified device doesn't match the network"
 msgstr "le périphérique indiqué ne correspond pas au réseau"
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr "Il n'existe pas d'\"image\".  Vouliez-vous un alias ?"
 
@@ -3546,7 +3550,7 @@ msgstr "Type : éphémère"
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr "URL"
 
@@ -3705,7 +3709,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr "OUI"
 
@@ -3732,7 +3736,7 @@ msgstr "vous devez spécifier un nom de conteneur source"
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3756,7 +3760,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3830,7 +3834,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 #, fuzzy
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
@@ -3863,7 +3867,7 @@ msgstr ""
 msgid "current"
 msgstr "Swap (courant)"
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr "par défaut"
 
@@ -3879,7 +3883,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 #, fuzzy
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
@@ -3989,7 +3993,7 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 #, fuzzy
 msgid "edit [<remote>:]<instance>"
 msgstr ""
@@ -4001,7 +4005,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 #, fuzzy
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
@@ -4065,7 +4069,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4152,7 +4156,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 #, fuzzy
 msgid "get-default"
 msgstr "par défaut"
@@ -4211,11 +4215,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -4228,7 +4232,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr ""
@@ -4501,7 +4505,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -4539,7 +4543,7 @@ msgstr "Nom du réseau"
 msgid "no"
 msgstr "non"
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr "ok (y/n) ?"
 
@@ -4577,7 +4581,7 @@ msgstr "Profils : %s"
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 #, fuzzy
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
@@ -4623,7 +4627,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 #, fuzzy
 msgid "remote"
 msgstr "Serveur distant : %s"
@@ -4632,11 +4636,11 @@ msgstr "Serveur distant : %s"
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4664,7 +4668,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4798,7 +4802,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4806,7 +4810,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr ""
@@ -4818,7 +4822,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 #, fuzzy
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
@@ -4946,7 +4950,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 #, fuzzy
 msgid "switch <remote>"
 msgstr "impossible de supprimer le serveur distant par défaut"
@@ -4961,7 +4965,7 @@ msgstr "impossible de supprimer le serveur distant par défaut"
 msgid "taken at %s"
 msgstr "pris à %s"
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4969,7 +4973,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -5030,7 +5034,7 @@ msgstr ""
 msgid "volume"
 msgstr "Colonnes"
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index ef78194328..03e43bbd6c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 3d3a791698..bbe49db240 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 790628e73b..37de3ceafb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Luigi Operoso <brokenpip3 at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -134,7 +134,7 @@ msgstr ""
 "### Un esempio è il seguente:\n"
 "###  description: My custom image"
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 #, fuzzy
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
@@ -349,11 +349,11 @@ msgstr "ALIAS"
 msgid "ARCHITECTURE"
 msgstr "ARCHITETTURA"
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr "Accetta certificato"
 
@@ -369,11 +369,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr "Aggiungi nuovi alias"
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr "Aggiungi un nuovo server remoto"
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -385,7 +385,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -398,7 +398,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, fuzzy, c-format
 msgid "Admin password for %s:"
 msgstr "Password amministratore per %s: "
@@ -471,7 +471,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -499,7 +499,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -536,7 +536,7 @@ msgstr "Byte inviati"
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr "NOME COMUNE"
 
@@ -598,7 +598,7 @@ msgstr "Impossibile effettuare il pull di una directory senza --recursive"
 msgid "Can't read from stdin: %s"
 msgstr "Impossible leggere da stdin: %s"
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -637,12 +637,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 #, fuzzy
 msgid "Client certificate stored at server:"
 msgstr "Certificato del client salvato dal server: "
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -698,7 +698,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -789,7 +789,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -838,7 +838,7 @@ msgstr "Creazione del container in corso"
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 #, fuzzy
 msgid "Create new instance file templates"
 msgstr "Creazione del container in corso"
@@ -904,7 +904,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -925,7 +925,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -957,17 +957,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -988,9 +988,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1103,7 +1103,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr "DATA DI SCADENZA"
 
@@ -1122,11 +1122,11 @@ msgstr "Creazione del container in corso"
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1159,11 +1159,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1186,7 +1186,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1254,11 +1254,11 @@ msgstr "Creazione del container in corso"
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1344,10 +1344,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1379,7 +1379,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1457,7 +1457,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1539,7 +1539,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1548,7 +1548,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr "Il nome del container è: %s"
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1557,12 +1557,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1607,7 +1607,7 @@ msgstr "numero errato di argomenti del sottocomando"
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, fuzzy, c-format
 msgid "Invalid protocol: %s"
 msgstr "Proprietà errata: %s"
@@ -1743,7 +1743,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1883,7 +1883,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1940,11 +1940,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 #, fuzzy
 msgid "Manage instance metadata files"
 msgstr "Creazione del container in corso"
@@ -1973,11 +1973,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -2024,10 +2024,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 #, fuzzy
 msgid "Missing instance name"
@@ -2141,7 +2141,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2155,7 +2155,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2215,7 +2215,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2261,7 +2261,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2303,11 +2303,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2356,8 +2356,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2468,7 +2468,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2477,11 +2477,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, fuzzy, c-format
 msgid "Publishing instance: %s"
 msgstr "Creazione del container in corso"
@@ -2532,31 +2532,35 @@ msgstr "Creazione del container in corso"
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, fuzzy, c-format
 msgid "Remote %s already exists"
 msgstr "il remote %s esiste già"
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, fuzzy, c-format
 msgid "Remote %s doesn't exist"
 msgstr "il remote %s non esiste"
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, fuzzy, c-format
 msgid "Remote %s exists as <%s>"
 msgstr "il remote %s esiste come %s"
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, fuzzy, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr "il remote %s è statico e non può essere modificato"
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2593,11 +2597,11 @@ msgstr "Creazione del container in corso"
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2627,7 +2631,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2718,7 +2722,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2738,19 +2742,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2859,7 +2863,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2883,7 +2887,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2903,7 +2907,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2947,7 +2951,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -3035,11 +3039,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -3112,7 +3116,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3150,7 +3154,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3188,7 +3192,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3288,7 +3292,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3433,7 +3437,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3459,7 +3463,7 @@ msgstr "Occorre specificare un nome di container come origine"
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3473,7 +3477,7 @@ msgstr "Creazione del container in corso"
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr "Creazione del container in corso"
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3538,7 +3542,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 #, fuzzy
 msgid "create [<remote>:]<instance> <template>"
 msgstr "Creazione del container in corso"
@@ -3567,7 +3571,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3579,7 +3583,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 #, fuzzy
 msgid "delete [<remote>:]<instance> <template>"
 msgstr "Creazione del container in corso"
@@ -3655,12 +3659,12 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 #, fuzzy
 msgid "edit [<remote>:]<instance>"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 #, fuzzy
 msgid "edit [<remote>:]<instance> <template>"
 msgstr "Creazione del container in corso"
@@ -3695,7 +3699,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3760,7 +3764,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr "Creazione del container in corso"
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3807,11 +3811,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3824,7 +3828,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr "Creazione del container in corso"
@@ -4069,7 +4073,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -4099,7 +4103,7 @@ msgstr ""
 msgid "no"
 msgstr "no"
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr "ok (y/n)?"
 
@@ -4129,7 +4133,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -4154,7 +4158,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -4162,11 +4166,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4188,7 +4192,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4267,7 +4271,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr "Creazione del container in corso"
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4275,12 +4279,12 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 #, fuzzy
 msgid "show [<remote>:]<instance> <template>"
 msgstr "Creazione del container in corso"
@@ -4358,7 +4362,7 @@ msgstr "Creazione del container in corso"
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4372,7 +4376,7 @@ msgstr "Creazione del container in corso"
 msgid "taken at %s"
 msgstr "salvato alle %s"
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4380,7 +4384,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4431,7 +4435,7 @@ msgstr ""
 msgid "volume"
 msgstr "Colonne"
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 9eca12b02a..bcaa70e4dd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: 2020-03-05 09:37+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -127,7 +127,7 @@ msgstr ""
 "### An example would be:\n"
 "###  description: My custom image"
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -349,11 +349,11 @@ msgstr "ALIASES"
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTURE"
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr "AUTH TYPE"
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr "証明書を受け入れます"
 
@@ -369,11 +369,11 @@ msgstr "インスタンスもしくはプロファイルにデバイスを追加
 msgid "Add new aliases"
 msgstr "新たにエイリアスを追加します"
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr "新たにリモートサーバを追加します"
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -392,7 +392,7 @@ msgstr ""
 "  lxc remote add some-name https://LOGIN:PASSWORD@example.com/some/path --"
 "protocol=simplestreams\n"
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr "新たに信頼済みのクライアントを追加します"
 
@@ -405,7 +405,7 @@ msgstr "インスタンスにプロファイルを追加します"
 msgid "Address: %s"
 msgstr "アドレス: %s"
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr "%s の管理者パスワード:"
@@ -482,7 +482,7 @@ msgstr ""
 "このコマンドはインスタンスのブートコンソールに接続できます。\n"
 "そしてそこから過去のログエントリを取り出すことができます。"
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr "認証タイプ '%s' はサーバではサポートされていません"
@@ -510,7 +510,7 @@ msgstr "バックアップのエクスポートが成功しました!"
 msgid "Bad key/value pair: %s"
 msgstr "不適切なキー/値のペア: %s"
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -548,7 +548,7 @@ msgstr "送信バイト数"
 msgid "CANCELABLE"
 msgstr "CANCELABLE"
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr "COMMON NAME"
 
@@ -610,7 +610,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr "標準入力から読み込めません: %s"
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr "デフォルトのリモートは削除できません"
 
@@ -635,7 +635,7 @@ msgstr "再帰 (recursive) モードでは uid/gid/mode を指定できません
 msgid "Can't unset key '%s', it's not currently set"
 msgstr "キー '%s' が設定されていないので削除できません"
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr "使用する Candid ドメイン"
 
@@ -649,12 +649,12 @@ msgstr "カード %d:"
 msgid "Card: %s (%s)"
 msgstr "カード: %s (%s)"
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr "クライアント証明書がサーバに格納されました:"
 
@@ -677,7 +677,7 @@ msgstr "クライアントバージョン: %s\n"
 msgid "Cluster member name"
 msgstr "クラスタメンバ名"
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr "クラスタリングが有効になりました"
 
@@ -713,7 +713,7 @@ msgstr "新しいプロジェクトに適用するキー/値の設定"
 msgid "Config key/value to apply to the target instance"
 msgstr "移動先のインスタンスに適用するキー/値の設定"
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -810,7 +810,7 @@ msgstr "コア %d"
 msgid "Cores:"
 msgstr "コア:"
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr "サーバ証明書格納用のディレクトリを作成できません"
 
@@ -858,7 +858,7 @@ msgstr "イメージからインスタンスを作成します"
 msgid "Create new custom storage volumes"
 msgstr "新たにカスタムストレージボリュームを作成します"
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr "新たにインスタンスのファイルテンプレートを作成します"
 
@@ -922,7 +922,7 @@ msgstr "DRM:"
 msgid "Define a compression algorithm: for backup or none"
 msgstr "圧縮アルゴリズムを指定します: backup or none"
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr "圧縮アルゴリズムを指定します: 圧縮アルゴリズム名 or none"
 
@@ -942,7 +942,7 @@ msgstr "イメージのエイリアスを削除します"
 msgid "Delete images"
 msgstr "イメージを削除します"
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr "インスタンスのファイルテンプレートを削除します"
 
@@ -973,17 +973,17 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -1004,9 +1004,9 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1119,7 +1119,7 @@ msgstr "ドライバ: %v (%v)"
 msgid "EPHEMERAL"
 msgstr "EPHEMERAL"
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr "EXPIRY DATE"
 
@@ -1139,11 +1139,11 @@ msgstr "インスタンス内のファイルを編集します"
 msgid "Edit image properties"
 msgstr "イメージのプロパティを編集します"
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr "インスタンスのファイルテンプレートを編集します"
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr "インスタンスのメタデータファイルを編集します"
 
@@ -1177,12 +1177,12 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 "'%s' 中のカラムエントリが空です (カラムの指定に空文字列が指定されています)"
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 "クラスタリングで動作していないLXDサーバ上でクラスタリングを有効にします"
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1214,7 +1214,7 @@ msgstr "環境変数を設定します (例: HOME=/home/foo)"
 msgid "Ephemeral instance"
 msgstr "Ephemeral インスタンス"
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr "テンプレートファイル更新のエラー: %s"
@@ -1294,11 +1294,11 @@ msgstr "バックアップのエクスポート中: %s"
 msgid "Exporting the image: %s"
 msgstr "イメージのエクスポート中: %s"
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr "FINGERPRINT"
@@ -1398,10 +1398,10 @@ msgstr ""
 "\n"
 "本当に強制的に %s を削除してもよろしいですか? (yes/no): "
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr "フォーマット (csv|json|table|yaml)"
@@ -1433,7 +1433,7 @@ msgstr "GPUs:"
 msgid "Generate manpages for all commands"
 msgstr "すべてのコマンドに対する man ページを作成します"
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "クライアント証明書を生成します。1分ぐらいかかります..."
 
@@ -1511,7 +1511,7 @@ msgstr "IPV4"
 msgid "IPV6"
 msgstr "IPV6"
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr "ISSUE DATE"
 
@@ -1596,7 +1596,7 @@ msgstr "Infiniband:"
 msgid "Input data"
 msgstr "入力するデータ"
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr "インスタンス名を指定する必要があります"
 
@@ -1605,7 +1605,7 @@ msgstr "インスタンス名を指定する必要があります"
 msgid "Instance name is: %s"
 msgstr "インスタンス名: %s"
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr "インスタンスは以下のフィンガープリントで publish されます: %s"
@@ -1614,12 +1614,12 @@ msgstr "インスタンスは以下のフィンガープリントで publish さ
 msgid "Instance type"
 msgstr "インスタンスタイプ"
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr "不正な URL スキーム \"%s\" (\"%s\" 内)"
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr "不正な証明書です"
 
@@ -1667,7 +1667,7 @@ msgstr "引数の数が不正です"
 msgid "Invalid path %s"
 msgstr "不正なパス %s"
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr "不正なプロトコル: %s"
@@ -1829,7 +1829,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr "インスタンスのデバイスを一覧表示します"
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr "インスタンスのファイルテンプレートを一覧表示します"
 
@@ -1977,11 +1977,11 @@ msgstr "プロジェクトを一覧表示します"
 msgid "List storage volumes"
 msgstr "ストレージボリュームを一覧表示します"
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr "利用可能なリモートサーバを一覧表示します"
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr "信頼済みクライアントを一覧表示します"
 
@@ -2029,7 +2029,7 @@ msgstr "MTU: %d"
 msgid "Make image public"
 msgstr "イメージを public にする"
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr "イメージを public にする"
 
@@ -2097,11 +2097,11 @@ msgstr "インスタンスやサーバの設定を管理します"
 msgid "Manage instance devices"
 msgstr "インスタンスのデバイスを管理します"
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr "インスタンスのファイルテンプレートを管理します"
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr "インスタンスのメタデータファイルを管理します"
 
@@ -2133,11 +2133,11 @@ msgstr ""
 "プレフィックスで指定しない限りは、ボリュームに対する操作はすべて \"カスタム"
 "\" (ユーザが作成した) ボリュームに対して行われます。"
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr "リモートサーバのリストを管理します"
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr "信頼済みのクライアントを管理します"
 
@@ -2184,10 +2184,10 @@ msgstr "マイグレーションが失敗しました"
 msgid "Minimum level for log messages"
 msgstr "表示するログメッセージの最小レベル"
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr "インスタンス名を指定する必要があります"
@@ -2306,7 +2306,7 @@ msgid "Must supply instance name for: "
 msgstr "インスタンス名を指定する必要があります: "
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr "NAME"
@@ -2320,7 +2320,7 @@ msgid "NICs:"
 msgstr "NICs:"
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr "NO"
 
@@ -2380,7 +2380,7 @@ msgstr "ネットワーク名:"
 msgid "Network usage:"
 msgstr "ネットワーク使用状況:"
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr "新しいエイリアスを定義する"
 
@@ -2426,7 +2426,7 @@ msgstr "\"カスタム\" のボリュームのみがインスタンスにアタ
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr "\"カスタム\" のボリュームのみがスナップショットを取得できます"
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr "simplestreams は https の URL のみサポートします"
 
@@ -2468,11 +2468,11 @@ msgstr "PROCESSES"
 msgid "PROFILES"
 msgstr "PROFILES"
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr "PROTOCOL"
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr "PUBLIC"
 
@@ -2520,8 +2520,8 @@ msgstr "ポート:"
 msgid "Press enter to open the editor again"
 msgstr "再度エディタを開くためには Enter キーを押します"
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr "再度エディタを起動するには Enter キーを押します"
 
@@ -2631,7 +2631,7 @@ msgstr "プロジェクト名 %s を %s に変更しました"
 msgid "Properties:"
 msgstr "プロパティ:"
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr "Public なイメージサーバとして設定します"
 
@@ -2640,11 +2640,11 @@ msgstr "Public なイメージサーバとして設定します"
 msgid "Public: %s"
 msgstr "パブリック: %s"
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr "インスタンスをイメージとして出力します"
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr "インスタンスの出力中: %s"
@@ -2694,31 +2694,35 @@ msgstr "インスタンスの更新中: %s"
 msgid "Refreshing the image: %s"
 msgstr "イメージの更新中: %s"
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr "リモート %s は既に存在します"
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr "リモート %s は存在しません"
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr "リモート %s は <%s> として存在します"
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr "リモート %s は static ですので変更できません"
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr "リモートの管理者パスワード"
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr "リモート操作がユーザによってキャンセルされました"
@@ -2754,11 +2758,11 @@ msgstr "インスタンスのデバイスを削除します"
 msgid "Remove profiles from instances"
 msgstr "インスタンスからプロファイルを削除します"
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr "リモートサーバを削除します"
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr "信頼済みクライアントを削除します"
 
@@ -2787,7 +2791,7 @@ msgstr "プロファイル名を変更します"
 msgid "Rename projects"
 msgstr "プロジェクト名を変更します"
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr "リモートサーバ名を変更します"
 
@@ -2883,7 +2887,7 @@ msgstr "SR-IOV 情報:"
 msgid "STATE"
 msgstr "STATE"
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr "STATIC"
 
@@ -2904,19 +2908,19 @@ msgstr "STORAGE POOL"
 msgid "Send a raw query to LXD"
 msgstr "直接リクエスト (raw query) を LXD に送ります"
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr "サーバの認証タイプ (tls もしくは candid)"
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr "ユーザによりサーバ証明書が拒否されました"
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr "認証後、サーバが我々を信用していません"
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr "サーバのプロトコル (lxd or simplestreams)"
 
@@ -3057,7 +3061,7 @@ msgstr ""
 "後方互換性のため、単一の設定を行う場合は次の形式でも設定できます:\n"
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr "リモートの URL を設定します"
 
@@ -3081,7 +3085,7 @@ msgstr "デバッグメッセージをすべて表示します"
 msgid "Show all information messages"
 msgstr "詳細な情報を出力します"
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr "インスタンスのファイルテンプレートの内容を表示します"
 
@@ -3101,7 +3105,7 @@ msgstr "インスタンスもしくはプロファイルのデバイス設定を
 msgid "Show image properties"
 msgstr "イメージのプロパティを表示します"
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr "インスタンスのメタデータファイルを表示します"
 
@@ -3145,7 +3149,7 @@ msgstr "ストレージボリュームの設定を表示します"
 msgid "Show storage volume configurations"
 msgstr "ストレージボリュームの設定を表示する"
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr "デフォルトのリモートを表示します"
 
@@ -3232,11 +3236,11 @@ msgstr "状態: %s"
 msgid "Stop instances"
 msgstr "インスタンスを停止します"
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr "実行中の場合、インスタンスを停止します"
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr "インスタンスの停止に失敗しました!"
 
@@ -3308,7 +3312,7 @@ msgstr "Swap (ピーク)"
 msgid "Switch the current project"
 msgstr "現在のプロジェクトを切り替えます"
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr "デフォルトのリモートを切り替えます"
 
@@ -3346,7 +3350,7 @@ msgstr "デバイスが存在しません"
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr "インスタンスは実行中です。先に停止させるか、--force を指定してください"
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3388,7 +3392,7 @@ msgstr "指定したデバイスが存在しません"
 msgid "The specified device doesn't match the network"
 msgstr "指定したデバイスはネットワークとマッチしません"
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 "publish 先にはイメージ名は指定できません。\"--alias\" オプションを使ってくだ"
@@ -3506,7 +3510,7 @@ msgstr "タイプ: %s (ephemeral)"
 msgid "UPLOAD DATE"
 msgstr "UPLOAD DATE"
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr "URL"
 
@@ -3658,7 +3662,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr "インスタンスの稼動状態のスナップショットを取得するかどうか"
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr "YES"
 
@@ -3683,7 +3687,7 @@ msgstr "コピー元のインスタンス名を指定してください"
 msgid "add <alias> <target>"
 msgstr "add <alias> <target>"
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr "add [<remote>:] <cert>"
 
@@ -3695,7 +3699,7 @@ msgstr "add [<remote>:]<instance> <profile>"
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr "add [<remote>] <IP|FQDN|URL>"
 
@@ -3763,7 +3767,7 @@ msgstr "copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]"
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr "create [<remote>:]<alias> <fingerprint>"
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr "create [<remote>:]<instance> <template>"
 
@@ -3791,7 +3795,7 @@ msgstr "create [<remote>:]<project>"
 msgid "current"
 msgstr "現在値"
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr "default"
 
@@ -3803,7 +3807,7 @@ msgstr "delete [<remote>:]<alias>"
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr "delete [<remote>:]<image> [[<remote>:]<image>...]"
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr "delete [<remote>:]<instance> <template>"
 
@@ -3879,11 +3883,11 @@ msgstr "ドライバ"
 msgid "edit [<remote>:]<image>"
 msgstr "edit [<remote>:]<image>"
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr "edit [<remote>:]<instance>"
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr "edit [<remote>:]<instance> <template>"
 
@@ -3915,7 +3919,7 @@ msgstr "edit [<remote>:]<project>"
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "edit [<remote>:][<instance>[/<snapshot>]]"
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr "enable [<remote>:] <name>"
 
@@ -3979,7 +3983,7 @@ msgstr "get [<remote>:]<project> <key>"
 msgid "get [<remote>:][<instance>] <key>"
 msgstr "get [<remote>:][<instance>] <key>"
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr "get-default"
 
@@ -4027,11 +4031,11 @@ msgstr "init [[<remote>:]<image>] [<remote>:][<name>] [< config"
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr "launch [<remote>:]<image> [<remote>:][<name>]"
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr "list"
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr "list [<remote>:]"
@@ -4044,7 +4048,7 @@ msgstr "list [<remote>:] [<filter>...]"
 msgid "list [<remote>:] [<filters>...]"
 msgstr "list [<remote>:] [<filters>...]"
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr "list [<remote>:]<instance>"
 
@@ -4401,7 +4405,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr "manpage <target>"
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr "metadata"
 
@@ -4431,7 +4435,7 @@ msgstr "network"
 msgid "no"
 msgstr "no"
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr "ok (y/n)?"
 
@@ -4459,7 +4463,7 @@ msgstr "profile"
 msgid "project"
 msgstr "project"
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -4489,7 +4493,7 @@ msgstr "query [<remote>:]<API path>"
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr "remote"
 
@@ -4497,11 +4501,11 @@ msgstr "remote"
 msgid "remove <alias>"
 msgstr "remove <alias>"
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr "remove <remote>"
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr "remove [<remote>:] <hostname|fingerprint>"
 
@@ -4521,7 +4525,7 @@ msgstr "remove [<remote>:]<member>"
 msgid "rename <old alias> <new alias>"
 msgstr "rename <old alias> <new alias>"
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr "rename <remote> <new-name>"
 
@@ -4597,7 +4601,7 @@ msgstr "set [<remote>:]<project> <key>=<value>..."
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr "set [<remote>:][<instance>] <key>=<value>..."
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr "set-url <remote> <URL>"
 
@@ -4605,11 +4609,11 @@ msgstr "set-url <remote> <URL>"
 msgid "show [<remote>:]<image>"
 msgstr "show [<remote>:]<image>"
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr "show [<remote>:]<instance>"
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr "show [<remote>:]<instance> <template>"
 
@@ -4681,7 +4685,7 @@ msgstr "stop [<remote>:]<instance> [[<remote>:]<instance>...]"
 msgid "storage"
 msgstr "storage"
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr "switch <remote>"
 
@@ -4694,7 +4698,7 @@ msgstr "switch [<remote>:] <project>"
 msgid "taken at %s"
 msgstr "%s に取得しました"
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr "template"
 
@@ -4702,7 +4706,7 @@ msgstr "template"
 msgid "total space"
 msgstr "総容量"
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr "trust"
 
@@ -4750,7 +4754,7 @@ msgstr "version [<remote>:]"
 msgid "volume"
 msgstr "volume"
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr "y"
 
diff --git a/po/ko.po b/po/ko.po
index 341e042fcb..70cdd9a609 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/lxd.pot b/po/lxd.pot
index c8be23f39b..b14083392b 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2020-03-06 14:23+0000\n"
+        "POT-Creation-Date: 2020-03-16 20:24-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"
@@ -74,7 +74,7 @@ msgid   "### This is a YAML representation of the image properties.\n"
         "###  description: My custom image"
 msgstr  ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid   "### This is a YAML representation of the instance metadata.\n"
         "### Any line starting with a '# will be ignored.\n"
         "###\n"
@@ -224,11 +224,11 @@ msgstr  ""
 msgid   "ARCHITECTURE"
 msgstr  ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid   "AUTH TYPE"
 msgstr  ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid   "Accept certificate"
 msgstr  ""
 
@@ -244,11 +244,11 @@ msgstr  ""
 msgid   "Add new aliases"
 msgstr  ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid   "Add new remote servers"
 msgstr  ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid   "Add new remote servers\n"
         "\n"
         "URL for remote resources must be HTTPS (https://).\n"
@@ -257,7 +257,7 @@ msgid   "Add new remote servers\n"
         "  lxc remote add some-name https://LOGIN:PASSWORD@example.com/some/path --protocol=simplestreams\n"
 msgstr  ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid   "Add new trusted clients"
 msgstr  ""
 
@@ -270,7 +270,7 @@ msgstr  ""
 msgid   "Address: %s"
 msgstr  ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid   "Admin password for %s:"
 msgstr  ""
@@ -342,7 +342,7 @@ msgid   "Attach to instance consoles\n"
         "as well as retrieve past log entries from it."
 msgstr  ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid   "Authentication type '%s' not supported by server"
 msgstr  ""
@@ -370,7 +370,7 @@ msgstr  ""
 msgid   "Bad key/value pair: %s"
 msgstr  ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176 lxc/storage.go:123 lxc/storage_volume.go:504
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172 lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid   "Bad key=value pair: %s"
 msgstr  ""
@@ -406,7 +406,7 @@ msgstr  ""
 msgid   "CANCELABLE"
 msgstr  ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid   "COMMON NAME"
 msgstr  ""
 
@@ -467,7 +467,7 @@ msgstr  ""
 msgid   "Can't read from stdin: %s"
 msgstr  ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid   "Can't remove the default remote"
 msgstr  ""
 
@@ -492,7 +492,7 @@ msgstr  ""
 msgid   "Can't unset key '%s', it's not currently set"
 msgstr  ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid   "Candid domain to use"
 msgstr  ""
 
@@ -506,12 +506,12 @@ msgstr  ""
 msgid   "Card: %s (%s)"
 msgstr  ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid   "Certificate fingerprint: %s"
 msgstr  ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid   "Client certificate stored at server:"
 msgstr  ""
 
@@ -524,7 +524,7 @@ msgstr  ""
 msgid   "Cluster member name"
 msgstr  ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid   "Clustering enabled"
 msgstr  ""
 
@@ -555,7 +555,7 @@ msgstr  ""
 msgid   "Config key/value to apply to the target instance"
 msgstr  ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143 lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142 lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304 lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
 msgid   "Config parsing error: %s"
 msgstr  ""
@@ -643,7 +643,7 @@ msgstr  ""
 msgid   "Cores:"
 msgstr  ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid   "Could not create server cert dir"
 msgstr  ""
 
@@ -686,7 +686,7 @@ msgstr  ""
 msgid   "Create new custom storage volumes"
 msgstr  ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid   "Create new instance file templates"
 msgstr  ""
 
@@ -749,7 +749,7 @@ msgstr  ""
 msgid   "Define a compression algorithm: for backup or none"
 msgstr  ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid   "Define a compression algorithm: for image or none"
 msgstr  ""
 
@@ -769,7 +769,7 @@ msgstr  ""
 msgid   "Delete images"
 msgstr  ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid   "Delete instance file templates"
 msgstr  ""
 
@@ -797,7 +797,7 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147 lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612 lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1286 lxc/storage_volume.go:1362 lxc/storage_volume.go:1461 lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147 lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612 lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27 lxc/config_metadata.go:52 lxc/config_metadata.go:174 lxc/config_template.go:28 lxc/config_template.go:65 lxc/config_template.go:108 lxc/config_template.go:150 lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590 lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31 lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459 lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1286 lxc/storage_volume.go:1362 lxc/storage_volume.go:1461 lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -896,7 +896,7 @@ msgstr  ""
 msgid   "EPHEMERAL"
 msgstr  ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid   "EXPIRY DATE"
 msgstr  ""
 
@@ -912,11 +912,11 @@ msgstr  ""
 msgid   "Edit image properties"
 msgstr  ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid   "Edit instance file templates"
 msgstr  ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid   "Edit instance metadata files"
 msgstr  ""
 
@@ -949,11 +949,11 @@ msgstr  ""
 msgid   "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr  ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid   "Enable clustering on a single non-clustered LXD server"
 msgstr  ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid   "Enable clustering on a single non-clustered LXD server\n"
         "\n"
         "  This command turns a non-clustered LXD server into the first member of a new\n"
@@ -972,7 +972,7 @@ msgstr  ""
 msgid   "Ephemeral instance"
 msgstr  ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid   "Error updating template file: %s"
 msgstr  ""
@@ -1035,11 +1035,11 @@ msgstr  ""
 msgid   "Exporting the image: %s"
 msgstr  ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid   "FILENAME"
 msgstr  ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005 lxc/image_alias.go:232
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005 lxc/image_alias.go:232
 msgid   "FINGERPRINT"
 msgstr  ""
 
@@ -1118,7 +1118,7 @@ msgid   "Forcefully removing a server from the cluster should only be done as a
         "Are you really sure you want to force removing %s? (yes/no): "
 msgstr  ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239 lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155 lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104 lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510 lxc/storage_volume.go:1071
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238 lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155 lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104 lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510 lxc/storage_volume.go:1071
 msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
@@ -1149,7 +1149,7 @@ msgstr  ""
 msgid   "Generate manpages for all commands"
 msgstr  ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid   "Generating a client certificate. This may take a minute..."
 msgstr  ""
 
@@ -1227,7 +1227,7 @@ msgstr  ""
 msgid   "IPV6"
 msgstr  ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid   "ISSUE DATE"
 msgstr  ""
 
@@ -1304,7 +1304,7 @@ msgstr  ""
 msgid   "Input data"
 msgstr  ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid   "Instance name is mandatory"
 msgstr  ""
 
@@ -1313,7 +1313,7 @@ msgstr  ""
 msgid   "Instance name is: %s"
 msgstr  ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid   "Instance published with fingerprint: %s"
 msgstr  ""
@@ -1322,12 +1322,12 @@ msgstr  ""
 msgid   "Instance type"
 msgstr  ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid   "Invalid URL scheme \"%s\" in \"%s\""
 msgstr  ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid   "Invalid certificate"
 msgstr  ""
 
@@ -1370,7 +1370,7 @@ msgstr  ""
 msgid   "Invalid path %s"
 msgstr  ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid   "Invalid protocol: %s"
 msgstr  ""
@@ -1501,7 +1501,7 @@ msgstr  ""
 msgid   "List instance devices"
 msgstr  ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid   "List instance file templates"
 msgstr  ""
 
@@ -1582,11 +1582,11 @@ msgstr  ""
 msgid   "List storage volumes"
 msgstr  ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid   "List the available remotes"
 msgstr  ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid   "List trusted clients"
 msgstr  ""
 
@@ -1634,7 +1634,7 @@ msgstr  ""
 msgid   "Make image public"
 msgstr  ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid   "Make the image public"
 msgstr  ""
 
@@ -1688,11 +1688,11 @@ msgstr  ""
 msgid   "Manage instance devices"
 msgstr  ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid   "Manage instance file templates"
 msgstr  ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid   "Manage instance metadata files"
 msgstr  ""
 
@@ -1718,11 +1718,11 @@ msgid   "Manage storage volumes\n"
         "Unless specified through a prefix, all volume operations affect \"custom\" (user created) volumes."
 msgstr  ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid   "Manage the list of remote servers"
 msgstr  ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid   "Manage trusted clients"
 msgstr  ""
 
@@ -1769,7 +1769,7 @@ msgstr  ""
 msgid   "Minimum level for log messages"
 msgstr  ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199 lxc/config_template.go:90 lxc/config_template.go:133 lxc/config_template.go:175 lxc/config_template.go:262 lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198 lxc/profile.go:660
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198 lxc/config_template.go:89 lxc/config_template.go:132 lxc/config_template.go:174 lxc/config_template.go:261 lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198 lxc/profile.go:660
 msgid   "Missing instance name"
 msgstr  ""
 
@@ -1862,7 +1862,7 @@ msgstr  ""
 msgid   "Must supply instance name for: "
 msgstr  ""
 
-#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620 lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558 lxc/storage_volume.go:1118
+#: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620 lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558 lxc/storage_volume.go:1118
 msgid   "NAME"
 msgstr  ""
 
@@ -1874,7 +1874,7 @@ msgstr  ""
 msgid   "NICs:"
 msgstr  ""
 
-#: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428 lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428 lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid   "NO"
 msgstr  ""
 
@@ -1934,7 +1934,7 @@ msgstr  ""
 msgid   "Network usage:"
 msgstr  ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid   "New alias to define at target"
 msgstr  ""
 
@@ -1980,7 +1980,7 @@ msgstr  ""
 msgid   "Only \"custom\" volumes can be snapshotted"
 msgstr  ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid   "Only https URLs are supported for simplestreams"
 msgstr  ""
 
@@ -2022,11 +2022,11 @@ msgstr  ""
 msgid   "PROFILES"
 msgstr  ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid   "PROTOCOL"
 msgstr  ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid   "PUBLIC"
 msgstr  ""
 
@@ -2073,7 +2073,7 @@ msgstr  ""
 msgid   "Press enter to open the editor again"
 msgstr  ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144 lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143 lxc/config_template.go:203 lxc/image.go:415
 msgid   "Press enter to start the editor again"
 msgstr  ""
 
@@ -2183,7 +2183,7 @@ msgstr  ""
 msgid   "Properties:"
 msgstr  ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid   "Public image server"
 msgstr  ""
 
@@ -2192,11 +2192,11 @@ msgstr  ""
 msgid   "Public: %s"
 msgstr  ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid   "Publish instances as images"
 msgstr  ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid   "Publishing instance: %s"
 msgstr  ""
@@ -2246,30 +2246,34 @@ msgstr  ""
 msgid   "Refreshing the image: %s"
 msgstr  ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid   "Remote %s already exists"
 msgstr  ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667 lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671 lxc/remote.go:709
 #, c-format
 msgid   "Remote %s doesn't exist"
 msgstr  ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid   "Remote %s exists as <%s>"
 msgstr  ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid   "Remote %s is static and cannot be modified"
 msgstr  ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid   "Remote admin password"
 msgstr  ""
 
+#: lxc/remote.go:122
+msgid   "Remote names may not contain colons"
+msgstr  ""
+
 #: lxc/utils/cancel.go:57
 msgid   "Remote operation canceled by user"
 msgstr  ""
@@ -2305,11 +2309,11 @@ msgstr  ""
 msgid   "Remove profiles from instances"
 msgstr  ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid   "Remove remotes"
 msgstr  ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid   "Remove trusted clients"
 msgstr  ""
 
@@ -2337,7 +2341,7 @@ msgstr  ""
 msgid   "Rename projects"
 msgstr  ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid   "Rename remotes"
 msgstr  ""
 
@@ -2424,7 +2428,7 @@ msgstr  ""
 msgid   "STATE"
 msgstr  ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid   "STATIC"
 msgstr  ""
 
@@ -2444,19 +2448,19 @@ msgstr  ""
 msgid   "Send a raw query to LXD"
 msgstr  ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid   "Server authentication type (tls or candid)"
 msgstr  ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid   "Server certificate NACKed by user"
 msgstr  ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid   "Server doesn't trust us after authentication"
 msgstr  ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid   "Server protocol (lxd or simplestreams)"
 msgstr  ""
 
@@ -2549,7 +2553,7 @@ msgid   "Set storage volume configuration keys\n"
         "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr  ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid   "Set the URL for the remote"
 msgstr  ""
 
@@ -2573,7 +2577,7 @@ msgstr  ""
 msgid   "Show all information messages"
 msgstr  ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid   "Show content of instance file templates"
 msgstr  ""
 
@@ -2593,7 +2597,7 @@ msgstr  ""
 msgid   "Show image properties"
 msgstr  ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid   "Show instance metadata files"
 msgstr  ""
 
@@ -2637,7 +2641,7 @@ msgstr  ""
 msgid   "Show storage volume configurations"
 msgstr  ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid   "Show the default remote"
 msgstr  ""
 
@@ -2724,11 +2728,11 @@ msgstr  ""
 msgid   "Stop instances"
 msgstr  ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid   "Stop the instance if currently running"
 msgstr  ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid   "Stopping instance failed!"
 msgstr  ""
 
@@ -2800,7 +2804,7 @@ msgstr  ""
 msgid   "Switch the current project"
 msgstr  ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid   "Switch the default remote"
 msgstr  ""
 
@@ -2836,7 +2840,7 @@ msgstr  ""
 msgid   "The instance is currently running, stop it first or pass --force"
 msgstr  ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid   "The instance is currently running. Use --force to have it stopped and restarted"
 msgstr  ""
 
@@ -2870,7 +2874,7 @@ msgstr  ""
 msgid   "The specified device doesn't match the network"
 msgstr  ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid   "There is no \"image name\".  Did you want an alias?"
 msgstr  ""
 
@@ -2965,7 +2969,7 @@ msgstr  ""
 msgid   "UPLOAD DATE"
 msgstr  ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid   "URL"
 msgstr  ""
 
@@ -3101,7 +3105,7 @@ msgstr  ""
 msgid   "Whether or not to snapshot the instance's running state"
 msgstr  ""
 
-#: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430 lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430 lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid   "YES"
 msgstr  ""
 
@@ -3125,7 +3129,7 @@ msgstr  ""
 msgid   "add <alias> <target>"
 msgstr  ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid   "add [<remote>:] <cert>"
 msgstr  ""
 
@@ -3137,7 +3141,7 @@ msgstr  ""
 msgid   "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr  ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid   "add [<remote>] <IP|FQDN|URL>"
 msgstr  ""
 
@@ -3197,7 +3201,7 @@ msgstr  ""
 msgid   "create [<remote>:]<alias> <fingerprint>"
 msgstr  ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid   "create [<remote>:]<instance> <template>"
 msgstr  ""
 
@@ -3225,7 +3229,7 @@ msgstr  ""
 msgid   "current"
 msgstr  ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid   "default"
 msgstr  ""
 
@@ -3237,7 +3241,7 @@ msgstr  ""
 msgid   "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr  ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid   "delete [<remote>:]<instance> <template>"
 msgstr  ""
 
@@ -3309,11 +3313,11 @@ msgstr  ""
 msgid   "edit [<remote>:]<image>"
 msgstr  ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid   "edit [<remote>:]<instance>"
 msgstr  ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid   "edit [<remote>:]<instance> <template>"
 msgstr  ""
 
@@ -3345,7 +3349,7 @@ msgstr  ""
 msgid   "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid   "enable [<remote>:] <name>"
 msgstr  ""
 
@@ -3407,7 +3411,7 @@ msgstr  ""
 msgid   "get [<remote>:][<instance>] <key>"
 msgstr  ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid   "get-default"
 msgstr  ""
 
@@ -3451,11 +3455,11 @@ msgstr  ""
 msgid   "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr  ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid   "list"
 msgstr  ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804 lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid   "list [<remote>:]"
 msgstr  ""
 
@@ -3467,7 +3471,7 @@ msgstr  ""
 msgid   "list [<remote>:] [<filters>...]"
 msgstr  ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid   "list [<remote>:]<instance>"
 msgstr  ""
 
@@ -3672,7 +3676,7 @@ msgstr  ""
 msgid   "manpage <target>"
 msgstr  ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid   "metadata"
 msgstr  ""
 
@@ -3700,7 +3704,7 @@ msgstr  ""
 msgid   "no"
 msgstr  ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid   "ok (y/n)?"
 msgstr  ""
 
@@ -3728,7 +3732,7 @@ msgstr  ""
 msgid   "project"
 msgstr  ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid   "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr  ""
 
@@ -3748,7 +3752,7 @@ msgstr  ""
 msgid   "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr  ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid   "remote"
 msgstr  ""
 
@@ -3756,11 +3760,11 @@ msgstr  ""
 msgid   "remove <alias>"
 msgstr  ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid   "remove <remote>"
 msgstr  ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid   "remove [<remote>:] <hostname|fingerprint>"
 msgstr  ""
 
@@ -3780,7 +3784,7 @@ msgstr  ""
 msgid   "rename <old alias> <new alias>"
 msgstr  ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid   "rename <remote> <new-name>"
 msgstr  ""
 
@@ -3852,7 +3856,7 @@ msgstr  ""
 msgid   "set [<remote>:][<instance>] <key>=<value>..."
 msgstr  ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid   "set-url <remote> <URL>"
 msgstr  ""
 
@@ -3860,11 +3864,11 @@ msgstr  ""
 msgid   "show [<remote>:]<image>"
 msgstr  ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid   "show [<remote>:]<instance>"
 msgstr  ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid   "show [<remote>:]<instance> <template>"
 msgstr  ""
 
@@ -3936,7 +3940,7 @@ msgstr  ""
 msgid   "storage"
 msgstr  ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid   "switch <remote>"
 msgstr  ""
 
@@ -3949,7 +3953,7 @@ msgstr  ""
 msgid   "taken at %s"
 msgstr  ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid   "template"
 msgstr  ""
 
@@ -3957,7 +3961,7 @@ msgstr  ""
 msgid   "total space"
 msgstr  ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid   "trust"
 msgstr  ""
 
@@ -4005,7 +4009,7 @@ msgstr  ""
 msgid   "volume"
 msgstr  ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid   "y"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 692f6d0adf..8a2598a964 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index e8eda4b96e..7edd57eb11 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -131,7 +131,7 @@ msgstr ""
 "### Bijvoorbeeld:\n"
 "###  description: Mijn eigen image"
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 #, fuzzy
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
@@ -350,11 +350,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTUUR"
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -370,11 +370,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -386,7 +386,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -472,7 +472,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -500,7 +500,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -537,7 +537,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -598,7 +598,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -637,12 +637,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -697,7 +697,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -788,7 +788,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -832,7 +832,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -896,7 +896,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -916,7 +916,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -947,17 +947,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -978,9 +978,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1091,7 +1091,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -1109,11 +1109,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1146,11 +1146,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1173,7 +1173,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1239,11 +1239,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1328,10 +1328,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1363,7 +1363,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1441,7 +1441,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1521,7 +1521,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1530,7 +1530,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1539,12 +1539,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1588,7 +1588,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1722,7 +1722,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1809,11 +1809,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1861,7 +1861,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1916,11 +1916,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1948,11 +1948,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1999,10 +1999,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -2114,7 +2114,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2128,7 +2128,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2188,7 +2188,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2234,7 +2234,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2276,11 +2276,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2328,8 +2328,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2439,7 +2439,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2448,11 +2448,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2502,31 +2502,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2562,11 +2566,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2595,7 +2599,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2684,7 +2688,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2704,19 +2708,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2825,7 +2829,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2849,7 +2853,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2869,7 +2873,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2913,7 +2917,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -3000,11 +3004,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -3076,7 +3080,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3114,7 +3118,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3151,7 +3155,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3251,7 +3255,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3395,7 +3399,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3419,7 +3423,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3431,7 +3435,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3495,7 +3499,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3523,7 +3527,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3535,7 +3539,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3609,11 +3613,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3645,7 +3649,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3708,7 +3712,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3754,11 +3758,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3771,7 +3775,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -4014,7 +4018,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -4043,7 +4047,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -4071,7 +4075,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -4096,7 +4100,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -4104,11 +4108,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4128,7 +4132,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4202,7 +4206,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4210,11 +4214,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4286,7 +4290,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4299,7 +4303,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4307,7 +4311,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4355,7 +4359,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 4b8df17df0..5367742c49 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 350d7921d8..6086fc30ee 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-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/"
@@ -133,7 +133,7 @@ msgstr ""
 "### config:\n"
 "###   size: \"61203283968\""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 #, fuzzy
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
@@ -360,11 +360,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -380,11 +380,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -396,7 +396,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -409,7 +409,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -482,7 +482,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -510,7 +510,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -547,7 +547,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -608,7 +608,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -633,7 +633,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -647,12 +647,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -707,7 +707,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -798,7 +798,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -906,7 +906,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -957,17 +957,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -988,9 +988,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1101,7 +1101,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -1119,11 +1119,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1156,11 +1156,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1249,11 +1249,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1338,10 +1338,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1373,7 +1373,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1531,7 +1531,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1549,12 +1549,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1598,7 +1598,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1732,7 +1732,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1819,11 +1819,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1871,7 +1871,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1926,11 +1926,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1958,11 +1958,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -2009,10 +2009,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -2124,7 +2124,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2138,7 +2138,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2198,7 +2198,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2244,7 +2244,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2286,11 +2286,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2338,8 +2338,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2458,11 +2458,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2512,31 +2512,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2572,11 +2576,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2605,7 +2609,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2694,7 +2698,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2714,19 +2718,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2835,7 +2839,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2859,7 +2863,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2879,7 +2883,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2923,7 +2927,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -3010,11 +3014,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -3086,7 +3090,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3124,7 +3128,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3161,7 +3165,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3261,7 +3265,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3405,7 +3409,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3429,7 +3433,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3441,7 +3445,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3505,7 +3509,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3533,7 +3537,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3545,7 +3549,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3619,11 +3623,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3655,7 +3659,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3718,7 +3722,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3764,11 +3768,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3781,7 +3785,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -4024,7 +4028,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -4053,7 +4057,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -4081,7 +4085,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -4106,7 +4110,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -4114,11 +4118,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4138,7 +4142,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4212,7 +4216,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4220,11 +4224,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4296,7 +4300,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4309,7 +4313,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4317,7 +4321,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4365,7 +4369,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 52416684a8..274c924994 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -133,7 +133,7 @@ msgstr ""
 "# # # um exemplo seria:\n"
 "# # # Descrição: Minha imagem personalizada"
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 #, fuzzy
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
@@ -363,11 +363,11 @@ msgstr "ALIASES"
 msgid "ARCHITECTURE"
 msgstr "ARQUITETURA"
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr "TIPO DE AUTENTICAÇÃO"
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr "Aceitar certificado"
 
@@ -384,11 +384,11 @@ msgstr "Adicionar dispositivos aos containers ou perfis"
 msgid "Add new aliases"
 msgstr "Adicionar novo aliases"
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr "Adicionar novos servidores remoto"
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -400,7 +400,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr "Adicionar novos clientes confiáveis"
 
@@ -414,7 +414,7 @@ msgstr "Adicionar perfis aos containers"
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, fuzzy, c-format
 msgid "Admin password for %s:"
 msgstr "Senha de administrador para %s: "
@@ -492,7 +492,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr "Tipo de autenticação '%s' não suportada pelo servidor"
@@ -520,7 +520,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:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -557,7 +557,7 @@ msgstr "Bytes enviado"
 msgid "CANCELABLE"
 msgstr "CANCELÁVEL"
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr "NOME COMUM"
 
@@ -619,7 +619,7 @@ msgstr "Não pode pegar um diretório sem --recursive"
 msgid "Can't read from stdin: %s"
 msgstr "Não é possível ler stdin: %s"
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr "Não é possível remover o default remoto"
 
@@ -644,7 +644,7 @@ msgstr "Não é possível fornecer o uid/gid/modo no modo recursivo"
 msgid "Can't unset key '%s', it's not currently set"
 msgstr "Não é possível remover chave '%s', não está atualmente definido"
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -658,12 +658,12 @@ msgstr "Cartão %d:"
 msgid "Card: %s (%s)"
 msgstr "Em cache: %s"
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr "Certificado fingerprint: %s"
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 #, fuzzy
 msgid "Client certificate stored at server:"
 msgstr "Certificado do cliente armazenado no servidor: "
@@ -687,7 +687,7 @@ msgstr "Versão do cliente: %s\n"
 msgid "Cluster member name"
 msgstr "Nome de membro do cluster"
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr "Clustering ativado"
 
@@ -726,7 +726,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr "Configuração chave/valor para aplicar ao novo contêiner"
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -819,7 +819,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr "Impossível criar diretório para certificado do servidor"
 
@@ -869,7 +869,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 #, fuzzy
 msgid "Create new instance file templates"
 msgstr "Editar templates de arquivo do container"
@@ -936,7 +936,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr "Definir um algoritmo de compressão: para imagem ou nenhum"
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr "Definir um algoritmo de compressão: para imagem ou nenhum"
 
@@ -957,7 +957,7 @@ msgstr "Apagar nomes alternativos da imagem"
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 #, fuzzy
 msgid "Delete instance file templates"
 msgstr "Editar templates de arquivo do container"
@@ -990,17 +990,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -1021,9 +1021,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr "EFÊMERO"
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr "DATA DE VALIDADE"
 
@@ -1157,12 +1157,12 @@ msgstr "Editar arquivos no container"
 msgid "Edit image properties"
 msgstr "Editar propriedades da imagem"
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 #, fuzzy
 msgid "Edit instance file templates"
 msgstr "Editar templates de arquivo do container"
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 #, fuzzy
 msgid "Edit instance metadata files"
 msgstr "Editar arquivos de metadados do container"
@@ -1198,11 +1198,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1225,7 +1225,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1291,11 +1291,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1380,10 +1380,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1415,7 +1415,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1496,7 +1496,7 @@ msgstr "IPV4"
 msgid "IPV6"
 msgstr "IPV6"
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1586,7 +1586,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, fuzzy, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr "Certificado fingerprint: %s"
@@ -1595,12 +1595,12 @@ msgstr "Certificado fingerprint: %s"
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1644,7 +1644,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1778,7 +1778,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 #, fuzzy
 msgid "List instance file templates"
 msgstr "Editar templates de arquivo do container"
@@ -1866,11 +1866,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1918,7 +1918,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1975,12 +1975,12 @@ msgstr "Editar configurações do container ou do servidor como YAML"
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 #, fuzzy
 msgid "Manage instance file templates"
 msgstr "Editar templates de arquivo do container"
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 #, fuzzy
 msgid "Manage instance metadata files"
 msgstr "Editar arquivos de metadados do container"
@@ -2009,11 +2009,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -2060,10 +2060,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -2175,7 +2175,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2189,7 +2189,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2249,7 +2249,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2295,7 +2295,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2337,11 +2337,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2389,8 +2389,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2504,7 +2504,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2513,11 +2513,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, fuzzy, c-format
 msgid "Publishing instance: %s"
 msgstr "Editar arquivos no container"
@@ -2568,31 +2568,35 @@ msgstr "Editar arquivos no container"
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2629,11 +2633,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr "Adicionar perfis aos containers"
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2662,7 +2666,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2751,7 +2755,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2771,19 +2775,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2895,7 +2899,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2919,7 +2923,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 #, fuzzy
 msgid "Show content of instance file templates"
 msgstr "Editar templates de arquivo do container"
@@ -2941,7 +2945,7 @@ msgstr "Adicionar dispositivos aos containers ou perfis"
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 #, fuzzy
 msgid "Show instance metadata files"
 msgstr "Editar arquivos de metadados do container"
@@ -2988,7 +2992,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -3075,11 +3079,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -3152,7 +3156,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3190,7 +3194,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3227,7 +3231,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3327,7 +3331,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3475,7 +3479,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3499,7 +3503,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3511,7 +3515,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3575,7 +3579,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3603,7 +3607,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3615,7 +3619,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3689,11 +3693,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3725,7 +3729,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3788,7 +3792,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3834,11 +3838,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3851,7 +3855,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -4094,7 +4098,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -4123,7 +4127,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -4151,7 +4155,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -4176,7 +4180,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -4184,11 +4188,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4208,7 +4212,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4282,7 +4286,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4290,11 +4294,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4366,7 +4370,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4379,7 +4383,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4387,7 +4391,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4435,7 +4439,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index e42a74b4db..6670e35320 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-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/"
@@ -135,7 +135,7 @@ msgstr ""
 "### Например:\n"
 "###  description: My custom image"
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 #, fuzzy
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
@@ -362,11 +362,11 @@ msgstr "ПСЕВДОНИМ"
 msgid "ARCHITECTURE"
 msgstr "АРХИТЕКТУРА"
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr "Принять сертификат"
 
@@ -383,11 +383,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr "Псевдонимы:"
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -399,7 +399,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -412,7 +412,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, fuzzy, c-format
 msgid "Admin password for %s:"
 msgstr "Пароль администратора для %s: "
@@ -486,7 +486,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -514,7 +514,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -551,7 +551,7 @@ msgstr "Отправлено байтов"
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr "ОБЩЕЕ ИМЯ"
 
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr "Невозможно прочитать из стандартного ввода: %s"
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -639,7 +639,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -653,12 +653,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 #, fuzzy
 msgid "Client certificate stored at server:"
 msgstr "Сертификат клиента хранится на сервере: "
@@ -682,7 +682,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -714,7 +714,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr "Не удалось создать каталог сертификата сервера"
 
@@ -856,7 +856,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Create new custom storage volumes"
 msgstr "Копирование образа: %s"
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 #, fuzzy
 msgid "Create new instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -924,7 +924,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -945,7 +945,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 #, fuzzy
 msgid "Delete instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -979,17 +979,17 @@ msgstr "Копирование образа: %s"
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -1010,9 +1010,9 @@ msgstr "Копирование образа: %s"
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -1127,7 +1127,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -1145,12 +1145,12 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 #, fuzzy
 msgid "Edit instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 #, fuzzy
 msgid "Edit instance metadata files"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -1184,11 +1184,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1211,7 +1211,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, fuzzy, c-format
 msgid "Error updating template file: %s"
 msgstr "Копирование образа: %s"
@@ -1280,11 +1280,11 @@ msgstr "Копирование образа: %s"
 msgid "Exporting the image: %s"
 msgstr "Копирование образа: %s"
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1369,10 +1369,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1482,7 +1482,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1565,7 +1565,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 #, fuzzy
 msgid "Instance name is mandatory"
 msgstr "Имя контейнера является обязательным"
@@ -1575,7 +1575,7 @@ msgstr "Имя контейнера является обязательным"
 msgid "Instance name is: %s"
 msgstr "Имя контейнера: %s"
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1584,12 +1584,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1633,7 +1633,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1769,7 +1769,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr "Копирование образа: %s"
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 #, fuzzy
 msgid "List instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -1859,11 +1859,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr "Копирование образа: %s"
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1911,7 +1911,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1967,12 +1967,12 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr "Копирование образа: %s"
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 #, fuzzy
 msgid "Manage instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 #, fuzzy
 msgid "Manage instance metadata files"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -2003,11 +2003,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -2056,10 +2056,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 #, fuzzy
 msgid "Missing instance name"
@@ -2175,7 +2175,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2189,7 +2189,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2250,7 +2250,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr " Использование сети:"
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2297,7 +2297,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2339,11 +2339,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2391,8 +2391,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2502,7 +2502,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2511,11 +2511,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, fuzzy, c-format
 msgid "Publishing instance: %s"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -2566,31 +2566,35 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Refreshing the image: %s"
 msgstr "Копирование образа: %s"
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2627,11 +2631,11 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2661,7 +2665,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2754,7 +2758,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2774,19 +2778,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2895,7 +2899,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2919,7 +2923,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 #, fuzzy
 msgid "Show content of instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -2940,7 +2944,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 #, fuzzy
 msgid "Show instance metadata files"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -2985,7 +2989,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -3074,11 +3078,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 #, fuzzy
 msgid "Stopping instance failed!"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -3152,7 +3156,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3190,7 +3194,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3227,7 +3231,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3327,7 +3331,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3471,7 +3475,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3495,7 +3499,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3515,7 +3519,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3588,7 +3592,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 #, fuzzy
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
@@ -3620,7 +3624,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3636,7 +3640,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 #, fuzzy
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
@@ -3742,7 +3746,7 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 #, fuzzy
 msgid "edit [<remote>:]<instance>"
 msgstr ""
@@ -3750,7 +3754,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 #, fuzzy
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
@@ -3798,7 +3802,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3881,7 +3885,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3935,11 +3939,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3952,7 +3956,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr ""
@@ -4203,7 +4207,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -4236,7 +4240,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -4272,7 +4276,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 #, fuzzy
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
@@ -4313,7 +4317,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -4321,11 +4325,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4353,7 +4357,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4471,7 +4475,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4479,7 +4483,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr ""
@@ -4487,7 +4491,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 #, fuzzy
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
@@ -4591,7 +4595,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4608,7 +4612,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4616,7 +4620,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4677,7 +4681,7 @@ msgstr ""
 msgid "volume"
 msgstr "Столбцы"
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index f552d651c0..719ec6a18b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 88fa9720d5..6f26c7f250 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 74aa8c5a08..7c125e58b4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index a9a5f7d387..26dce7658f 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 94409d3377..0bec276bf0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index a26859fb91..002a8230ff 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -78,7 +78,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -233,11 +233,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -269,7 +269,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -355,7 +355,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -420,7 +420,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -830,17 +830,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -861,9 +861,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -974,7 +974,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -992,11 +992,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1029,11 +1029,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1122,11 +1122,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1211,10 +1211,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1422,12 +1422,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1471,7 +1471,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1799,11 +1799,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1831,11 +1831,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1882,10 +1882,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2159,11 +2159,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2211,8 +2211,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2331,11 +2331,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2385,31 +2385,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2445,11 +2449,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2478,7 +2482,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2587,19 +2591,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2708,7 +2712,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2752,7 +2756,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2796,7 +2800,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2883,11 +2887,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2959,7 +2963,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3034,7 +3038,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3134,7 +3138,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3278,7 +3282,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3302,7 +3306,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3314,7 +3318,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3378,7 +3382,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3406,7 +3410,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3418,7 +3422,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3492,11 +3496,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3528,7 +3532,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3591,7 +3595,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3637,11 +3641,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3654,7 +3658,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3897,7 +3901,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3926,7 +3930,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3954,7 +3958,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3979,7 +3983,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3987,11 +3991,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4011,7 +4015,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4093,11 +4097,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4169,7 +4173,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4182,7 +4186,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4190,7 +4194,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4238,7 +4242,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index 152a8d0d34..87225d3a26 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-16 20:24-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/"
@@ -81,7 +81,7 @@ msgid ""
 "###  description: My custom image"
 msgstr ""
 
-#: lxc/config_metadata.go:62
+#: lxc/config_metadata.go:61
 msgid ""
 "### This is a YAML representation of the instance metadata.\n"
 "### Any line starting with a '# will be ignored.\n"
@@ -236,11 +236,11 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:516
+#: lxc/remote.go:520
 msgid "AUTH TYPE"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/remote.go:94
 msgid "Accept certificate"
 msgstr ""
 
@@ -256,11 +256,11 @@ msgstr ""
 msgid "Add new aliases"
 msgstr ""
 
-#: lxc/remote.go:84
+#: lxc/remote.go:83
 msgid "Add new remote servers"
 msgstr ""
 
-#: lxc/remote.go:85
+#: lxc/remote.go:84
 msgid ""
 "Add new remote servers\n"
 "\n"
@@ -272,7 +272,7 @@ msgid ""
 "protocol=simplestreams\n"
 msgstr ""
 
-#: lxc/config_trust.go:57 lxc/config_trust.go:58
+#: lxc/config_trust.go:56 lxc/config_trust.go:57
 msgid "Add new trusted clients"
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Address: %s"
 msgstr ""
 
-#: lxc/remote.go:364
+#: lxc/remote.go:368
 #, c-format
 msgid "Admin password for %s:"
 msgstr ""
@@ -358,7 +358,7 @@ msgid ""
 "as well as retrieve past log entries from it."
 msgstr ""
 
-#: lxc/remote.go:347
+#: lxc/remote.go:351
 #, c-format
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
@@ -386,7 +386,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:176
+#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:504
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -423,7 +423,7 @@ msgstr ""
 msgid "CANCELABLE"
 msgstr ""
 
-#: lxc/config_trust.go:174
+#: lxc/config_trust.go:173
 msgid "COMMON NAME"
 msgstr ""
 
@@ -484,7 +484,7 @@ msgstr ""
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/remote.go:625
+#: lxc/remote.go:629
 msgid "Can't remove the default remote"
 msgstr ""
 
@@ -509,7 +509,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set"
 msgstr ""
 
-#: lxc/remote.go:100
+#: lxc/remote.go:99
 msgid "Candid domain to use"
 msgstr ""
 
@@ -523,12 +523,12 @@ msgstr ""
 msgid "Card: %s (%s)"
 msgstr ""
 
-#: lxc/remote.go:259
+#: lxc/remote.go:263
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:403
+#: lxc/remote.go:407
 msgid "Client certificate stored at server:"
 msgstr ""
 
@@ -551,7 +551,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:403
+#: lxc/cluster.go:401
 msgid "Clustering enabled"
 msgstr ""
 
@@ -583,7 +583,7 @@ msgstr ""
 msgid "Config key/value to apply to the target instance"
 msgstr ""
 
-#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:143
+#: lxc/config.go:270 lxc/config.go:343 lxc/config_metadata.go:142
 #: lxc/image.go:414 lxc/network.go:640 lxc/profile.go:498 lxc/project.go:304
 #: lxc/storage.go:303 lxc/storage_volume.go:917 lxc/storage_volume.go:947
 #, c-format
@@ -674,7 +674,7 @@ msgstr ""
 msgid "Cores:"
 msgstr ""
 
-#: lxc/remote.go:274
+#: lxc/remote.go:278
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -718,7 +718,7 @@ msgstr ""
 msgid "Create new custom storage volumes"
 msgstr ""
 
-#: lxc/config_template.go:65 lxc/config_template.go:66
+#: lxc/config_template.go:64 lxc/config_template.go:65
 msgid "Create new instance file templates"
 msgstr ""
 
@@ -782,7 +782,7 @@ msgstr ""
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
-#: lxc/publish.go:42
+#: lxc/publish.go:38
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "Delete images"
 msgstr ""
 
-#: lxc/config_template.go:108 lxc/config_template.go:109
+#: lxc/config_template.go:107 lxc/config_template.go:108
 msgid "Delete instance file templates"
 msgstr ""
 
@@ -833,17 +833,17 @@ msgstr ""
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
-#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:330 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:612
 #: lxc/config.go:731 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
 #: lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513
-#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28
-#: lxc/config_metadata.go:53 lxc/config_metadata.go:175
-#: lxc/config_template.go:29 lxc/config_template.go:66
-#: lxc/config_template.go:109 lxc/config_template.go:151
-#: lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29
-#: lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194
+#: lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:27
+#: lxc/config_metadata.go:52 lxc/config_metadata.go:174
+#: lxc/config_template.go:28 lxc/config_template.go:65
+#: lxc/config_template.go:108 lxc/config_template.go:150
+#: lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28
+#: lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193
 #: lxc/console.go:31 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:40
 #: lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154
 #: lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128
@@ -864,9 +864,9 @@ msgstr ""
 #: lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29
 #: lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334
 #: lxc/project.go:384 lxc/project.go:475 lxc/project.go:530 lxc/project.go:590
-#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:35 lxc/query.go:31
-#: lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455
-#: lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685
+#: lxc/project.go:619 lxc/project.go:672 lxc/publish.go:31 lxc/query.go:31
+#: lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:423 lxc/remote.go:459
+#: lxc/remote.go:539 lxc/remote.go:601 lxc/remote.go:651 lxc/remote.go:689
 #: lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33
 #: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
 #: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
@@ -977,7 +977,7 @@ msgstr ""
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config_trust.go:176
+#: lxc/config_trust.go:175
 msgid "EXPIRY DATE"
 msgstr ""
 
@@ -995,11 +995,11 @@ msgstr ""
 msgid "Edit image properties"
 msgstr ""
 
-#: lxc/config_template.go:150 lxc/config_template.go:151
+#: lxc/config_template.go:149 lxc/config_template.go:150
 msgid "Edit instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:52 lxc/config_metadata.go:53
+#: lxc/config_metadata.go:51 lxc/config_metadata.go:52
 msgid "Edit instance metadata files"
 msgstr ""
 
@@ -1032,11 +1032,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:329
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:332
+#: lxc/cluster.go:330
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Ephemeral instance"
 msgstr ""
 
-#: lxc/config_template.go:203
+#: lxc/config_template.go:202
 #, c-format
 msgid "Error updating template file: %s"
 msgstr ""
@@ -1125,11 +1125,11 @@ msgstr ""
 msgid "Exporting the image: %s"
 msgstr ""
 
-#: lxc/config_template.go:279
+#: lxc/config_template.go:278
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:173 lxc/image.go:1004 lxc/image.go:1005
+#: lxc/config_trust.go:172 lxc/image.go:1004 lxc/image.go:1005
 #: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
@@ -1214,10 +1214,10 @@ msgid ""
 "Are you really sure you want to force removing %s? (yes/no): "
 msgstr ""
 
-#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:239
-#: lxc/config_trust.go:118 lxc/image.go:994 lxc/image_alias.go:155
+#: lxc/alias.go:102 lxc/cluster.go:70 lxc/config_template.go:238
+#: lxc/config_trust.go:117 lxc/image.go:994 lxc/image_alias.go:155
 #: lxc/list.go:115 lxc/network.go:811 lxc/network.go:894 lxc/operation.go:104
-#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:459 lxc/storage.go:510
+#: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1071
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
@@ -1249,7 +1249,7 @@ msgstr ""
 msgid "Generate manpages for all commands"
 msgstr ""
 
-#: lxc/remote.go:215
+#: lxc/remote.go:219
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -1327,7 +1327,7 @@ msgstr ""
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config_trust.go:175
+#: lxc/config_trust.go:174
 msgid "ISSUE DATE"
 msgstr ""
 
@@ -1407,7 +1407,7 @@ msgstr ""
 msgid "Input data"
 msgstr ""
 
-#: lxc/publish.go:80
+#: lxc/publish.go:76
 msgid "Instance name is mandatory"
 msgstr ""
 
@@ -1416,7 +1416,7 @@ msgstr ""
 msgid "Instance name is: %s"
 msgstr ""
 
-#: lxc/publish.go:276
+#: lxc/publish.go:274
 #, c-format
 msgid "Instance published with fingerprint: %s"
 msgstr ""
@@ -1425,12 +1425,12 @@ msgstr ""
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:167
+#: lxc/remote.go:171
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config_trust.go:157
+#: lxc/config_trust.go:156
 msgid "Invalid certificate"
 msgstr ""
 
@@ -1474,7 +1474,7 @@ msgstr ""
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/remote.go:156
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid protocol: %s"
 msgstr ""
@@ -1608,7 +1608,7 @@ msgstr ""
 msgid "List instance devices"
 msgstr ""
 
-#: lxc/config_template.go:236 lxc/config_template.go:237
+#: lxc/config_template.go:235 lxc/config_template.go:236
 msgid "List instance file templates"
 msgstr ""
 
@@ -1695,11 +1695,11 @@ msgstr ""
 msgid "List storage volumes"
 msgstr ""
 
-#: lxc/remote.go:454 lxc/remote.go:455
+#: lxc/remote.go:458 lxc/remote.go:459
 msgid "List the available remotes"
 msgstr ""
 
-#: lxc/config_trust.go:115 lxc/config_trust.go:116
+#: lxc/config_trust.go:114 lxc/config_trust.go:115
 msgid "List trusted clients"
 msgstr ""
 
@@ -1747,7 +1747,7 @@ msgstr ""
 msgid "Make image public"
 msgstr ""
 
-#: lxc/publish.go:39
+#: lxc/publish.go:35
 msgid "Make the image public"
 msgstr ""
 
@@ -1802,11 +1802,11 @@ msgstr ""
 msgid "Manage instance devices"
 msgstr ""
 
-#: lxc/config_template.go:28 lxc/config_template.go:29
+#: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
 
-#: lxc/config_metadata.go:27 lxc/config_metadata.go:28
+#: lxc/config_metadata.go:26 lxc/config_metadata.go:27
 msgid "Manage instance metadata files"
 msgstr ""
 
@@ -1834,11 +1834,11 @@ msgid ""
 "\" (user created) volumes."
 msgstr ""
 
-#: lxc/remote.go:33 lxc/remote.go:34
+#: lxc/remote.go:32 lxc/remote.go:33
 msgid "Manage the list of remote servers"
 msgstr ""
 
-#: lxc/config_trust.go:28 lxc/config_trust.go:29
+#: lxc/config_trust.go:27 lxc/config_trust.go:28
 msgid "Manage trusted clients"
 msgstr ""
 
@@ -1885,10 +1885,10 @@ msgstr ""
 msgid "Minimum level for log messages"
 msgstr ""
 
-#: lxc/config_metadata.go:101 lxc/config_metadata.go:199
-#: lxc/config_template.go:90 lxc/config_template.go:133
-#: lxc/config_template.go:175 lxc/config_template.go:262
-#: lxc/config_template.go:320 lxc/profile.go:125 lxc/profile.go:198
+#: lxc/config_metadata.go:100 lxc/config_metadata.go:198
+#: lxc/config_template.go:89 lxc/config_template.go:132
+#: lxc/config_template.go:174 lxc/config_template.go:261
+#: lxc/config_template.go:319 lxc/profile.go:125 lxc/profile.go:198
 #: lxc/profile.go:660
 msgid "Missing instance name"
 msgstr ""
@@ -2000,7 +2000,7 @@ msgid "Must supply instance name for: "
 msgstr ""
 
 #: lxc/cluster.go:126 lxc/list.go:427 lxc/network.go:867 lxc/profile.go:620
-#: lxc/project.go:454 lxc/remote.go:513 lxc/storage.go:558
+#: lxc/project.go:454 lxc/remote.go:517 lxc/storage.go:558
 #: lxc/storage_volume.go:1118
 msgid "NAME"
 msgstr ""
@@ -2014,7 +2014,7 @@ msgid "NICs:"
 msgstr ""
 
 #: lxc/network.go:852 lxc/operation.go:143 lxc/project.go:428
-#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:476 lxc/remote.go:481
+#: lxc/project.go:433 lxc/project.go:438 lxc/remote.go:480 lxc/remote.go:485
 msgid "NO"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/publish.go:40
+#: lxc/publish.go:36
 msgid "New alias to define at target"
 msgstr ""
 
@@ -2120,7 +2120,7 @@ msgstr ""
 msgid "Only \"custom\" volumes can be snapshotted"
 msgstr ""
 
-#: lxc/remote.go:150
+#: lxc/remote.go:154
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
@@ -2162,11 +2162,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:515
+#: lxc/remote.go:519
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:1006 lxc/remote.go:517
+#: lxc/image.go:1006 lxc/remote.go:521
 msgid "PUBLIC"
 msgstr ""
 
@@ -2214,8 +2214,8 @@ msgstr ""
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:144
-#: lxc/config_template.go:204 lxc/image.go:415
+#: lxc/config.go:271 lxc/config.go:344 lxc/config_metadata.go:143
+#: lxc/config_template.go:203 lxc/image.go:415
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -2325,7 +2325,7 @@ msgstr ""
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:99
+#: lxc/remote.go:98
 msgid "Public image server"
 msgstr ""
 
@@ -2334,11 +2334,11 @@ msgstr ""
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:34 lxc/publish.go:35
+#: lxc/publish.go:30 lxc/publish.go:31
 msgid "Publish instances as images"
 msgstr ""
 
-#: lxc/publish.go:222
+#: lxc/publish.go:220
 #, c-format
 msgid "Publishing instance: %s"
 msgstr ""
@@ -2388,31 +2388,35 @@ msgstr ""
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:563
+#: lxc/remote.go:567
 #, c-format
 msgid "Remote %s already exists"
 msgstr ""
 
-#: lxc/project.go:699 lxc/remote.go:555 lxc/remote.go:617 lxc/remote.go:667
-#: lxc/remote.go:705
+#: lxc/project.go:699 lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:671
+#: lxc/remote.go:709
 #, c-format
 msgid "Remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:124
+#: lxc/remote.go:128
 #, c-format
 msgid "Remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:559 lxc/remote.go:621 lxc/remote.go:709
+#: lxc/remote.go:563 lxc/remote.go:625 lxc/remote.go:713
 #, c-format
 msgid "Remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Remote admin password"
 msgstr ""
 
+#: lxc/remote.go:122
+msgid "Remote names may not contain colons"
+msgstr ""
+
 #: lxc/utils/cancel.go:57
 msgid "Remote operation canceled by user"
 msgstr ""
@@ -2448,11 +2452,11 @@ msgstr ""
 msgid "Remove profiles from instances"
 msgstr ""
 
-#: lxc/remote.go:596 lxc/remote.go:597
+#: lxc/remote.go:600 lxc/remote.go:601
 msgid "Remove remotes"
 msgstr ""
 
-#: lxc/config_trust.go:193 lxc/config_trust.go:194
+#: lxc/config_trust.go:192 lxc/config_trust.go:193
 msgid "Remove trusted clients"
 msgstr ""
 
@@ -2481,7 +2485,7 @@ msgstr ""
 msgid "Rename projects"
 msgstr ""
 
-#: lxc/remote.go:534 lxc/remote.go:535
+#: lxc/remote.go:538 lxc/remote.go:539
 msgid "Rename remotes"
 msgstr ""
 
@@ -2570,7 +2574,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:518
+#: lxc/remote.go:522
 msgid "STATIC"
 msgstr ""
 
@@ -2590,19 +2594,19 @@ msgstr ""
 msgid "Send a raw query to LXD"
 msgstr ""
 
-#: lxc/remote.go:98
+#: lxc/remote.go:97
 msgid "Server authentication type (tls or candid)"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:271
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:399
+#: lxc/remote.go:403
 msgid "Server doesn't trust us after authentication"
 msgstr ""
 
-#: lxc/remote.go:97
+#: lxc/remote.go:96
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -2711,7 +2715,7 @@ msgid ""
 "    lxc storage volume set [<remote>:]<pool> <volume> <key> <value>"
 msgstr ""
 
-#: lxc/remote.go:684 lxc/remote.go:685
+#: lxc/remote.go:688 lxc/remote.go:689
 msgid "Set the URL for the remote"
 msgstr ""
 
@@ -2735,7 +2739,7 @@ msgstr ""
 msgid "Show all information messages"
 msgstr ""
 
-#: lxc/config_template.go:295 lxc/config_template.go:296
+#: lxc/config_template.go:294 lxc/config_template.go:295
 msgid "Show content of instance file templates"
 msgstr ""
 
@@ -2755,7 +2759,7 @@ msgstr ""
 msgid "Show image properties"
 msgstr ""
 
-#: lxc/config_metadata.go:174 lxc/config_metadata.go:175
+#: lxc/config_metadata.go:173 lxc/config_metadata.go:174
 msgid "Show instance metadata files"
 msgstr ""
 
@@ -2799,7 +2803,7 @@ msgstr ""
 msgid "Show storage volume configurations"
 msgstr ""
 
-#: lxc/remote.go:418 lxc/remote.go:419
+#: lxc/remote.go:422 lxc/remote.go:423
 msgid "Show the default remote"
 msgstr ""
 
@@ -2886,11 +2890,11 @@ msgstr ""
 msgid "Stop instances"
 msgstr ""
 
-#: lxc/publish.go:41
+#: lxc/publish.go:37
 msgid "Stop the instance if currently running"
 msgstr ""
 
-#: lxc/publish.go:145
+#: lxc/publish.go:141
 msgid "Stopping instance failed!"
 msgstr ""
 
@@ -2962,7 +2966,7 @@ msgstr ""
 msgid "Switch the current project"
 msgstr ""
 
-#: lxc/remote.go:646 lxc/remote.go:647
+#: lxc/remote.go:650 lxc/remote.go:651
 msgid "Switch the default remote"
 msgstr ""
 
@@ -3000,7 +3004,7 @@ msgstr ""
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 
-#: lxc/publish.go:110
+#: lxc/publish.go:106
 msgid ""
 "The instance is currently running. Use --force to have it stopped and "
 "restarted"
@@ -3037,7 +3041,7 @@ msgstr ""
 msgid "The specified device doesn't match the network"
 msgstr ""
 
-#: lxc/publish.go:83
+#: lxc/publish.go:79
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
@@ -3137,7 +3141,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/cluster.go:127 lxc/remote.go:514
+#: lxc/cluster.go:127 lxc/remote.go:518
 msgid "URL"
 msgstr ""
 
@@ -3281,7 +3285,7 @@ msgid "Whether or not to snapshot the instance's running state"
 msgstr ""
 
 #: lxc/network.go:854 lxc/operation.go:145 lxc/project.go:430
-#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:478 lxc/remote.go:483
+#: lxc/project.go:435 lxc/project.go:440 lxc/remote.go:482 lxc/remote.go:487
 msgid "YES"
 msgstr ""
 
@@ -3305,7 +3309,7 @@ msgstr ""
 msgid "add <alias> <target>"
 msgstr ""
 
-#: lxc/config_trust.go:56
+#: lxc/config_trust.go:55
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
@@ -3317,7 +3321,7 @@ msgstr ""
 msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 msgstr ""
 
-#: lxc/remote.go:83
+#: lxc/remote.go:82
 msgid "add [<remote>] <IP|FQDN|URL>"
 msgstr ""
 
@@ -3381,7 +3385,7 @@ msgstr ""
 msgid "create [<remote>:]<alias> <fingerprint>"
 msgstr ""
 
-#: lxc/config_template.go:64
+#: lxc/config_template.go:63
 msgid "create [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3409,7 +3413,7 @@ msgstr ""
 msgid "current"
 msgstr ""
 
-#: lxc/remote.go:506
+#: lxc/remote.go:510
 msgid "default"
 msgstr ""
 
@@ -3421,7 +3425,7 @@ msgstr ""
 msgid "delete [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/config_template.go:106
+#: lxc/config_template.go:105
 msgid "delete [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3495,11 +3499,11 @@ msgstr ""
 msgid "edit [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:51
+#: lxc/config_metadata.go:50
 msgid "edit [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:149
+#: lxc/config_template.go:148
 msgid "edit [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -3531,7 +3535,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:328
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3594,7 +3598,7 @@ msgstr ""
 msgid "get [<remote>:][<instance>] <key>"
 msgstr ""
 
-#: lxc/remote.go:417
+#: lxc/remote.go:421
 msgid "get-default"
 msgstr ""
 
@@ -3640,11 +3644,11 @@ msgstr ""
 msgid "launch [<remote>:]<image> [<remote>:][<name>]"
 msgstr ""
 
-#: lxc/alias.go:97 lxc/remote.go:452
+#: lxc/alias.go:97 lxc/remote.go:456
 msgid "list"
 msgstr ""
 
-#: lxc/cluster.go:65 lxc/config_trust.go:113 lxc/network.go:804
+#: lxc/cluster.go:65 lxc/config_trust.go:112 lxc/network.go:804
 #: lxc/operation.go:99 lxc/profile.go:574 lxc/project.go:381 lxc/storage.go:505
 msgid "list [<remote>:]"
 msgstr ""
@@ -3657,7 +3661,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:235
+#: lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
@@ -3900,7 +3904,7 @@ msgstr ""
 msgid "manpage <target>"
 msgstr ""
 
-#: lxc/config_metadata.go:26
+#: lxc/config_metadata.go:25
 msgid "metadata"
 msgstr ""
 
@@ -3929,7 +3933,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:260
+#: lxc/remote.go:264
 msgid "ok (y/n)?"
 msgstr ""
 
@@ -3957,7 +3961,7 @@ msgstr ""
 msgid "project"
 msgstr ""
 
-#: lxc/publish.go:33
+#: lxc/publish.go:29
 msgid ""
 "publish [<remote>:]<instance>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr ""
@@ -3982,7 +3986,7 @@ msgstr ""
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
-#: lxc/remote.go:32
+#: lxc/remote.go:31
 msgid "remote"
 msgstr ""
 
@@ -3990,11 +3994,11 @@ msgstr ""
 msgid "remove <alias>"
 msgstr ""
 
-#: lxc/remote.go:594
+#: lxc/remote.go:598
 msgid "remove <remote>"
 msgstr ""
 
-#: lxc/config_trust.go:191
+#: lxc/config_trust.go:190
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
@@ -4014,7 +4018,7 @@ msgstr ""
 msgid "rename <old alias> <new alias>"
 msgstr ""
 
-#: lxc/remote.go:532
+#: lxc/remote.go:536
 msgid "rename <remote> <new-name>"
 msgstr ""
 
@@ -4088,7 +4092,7 @@ msgstr ""
 msgid "set [<remote>:][<instance>] <key>=<value>..."
 msgstr ""
 
-#: lxc/remote.go:683
+#: lxc/remote.go:687
 msgid "set-url <remote> <URL>"
 msgstr ""
 
@@ -4096,11 +4100,11 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:173
+#: lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_template.go:294
+#: lxc/config_template.go:293
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
@@ -4172,7 +4176,7 @@ msgstr ""
 msgid "storage"
 msgstr ""
 
-#: lxc/remote.go:645
+#: lxc/remote.go:649
 msgid "switch <remote>"
 msgstr ""
 
@@ -4185,7 +4189,7 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/config_template.go:27
+#: lxc/config_template.go:26
 msgid "template"
 msgstr ""
 
@@ -4193,7 +4197,7 @@ msgstr ""
 msgid "total space"
 msgstr ""
 
-#: lxc/config_trust.go:27
+#: lxc/config_trust.go:26
 msgid "trust"
 msgstr ""
 
@@ -4241,7 +4245,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/remote.go:266
+#: lxc/remote.go:270
 msgid "y"
 msgstr ""
 


More information about the lxc-devel mailing list