[lxc-devel] [lxd/master] Tweak `lxc config device` and `lxc profile device` usage

stgraber on Github lxc-bot at linuxcontainers.org
Wed Sep 9 18:21:38 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/20200909/5b43de7a/attachment-0001.bin>
-------------- next part --------------
From baa484ad0d7dc5d95e37e4eadbe82f89700291e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 9 Sep 2020 14:19:10 -0400
Subject: [PATCH 1/2] lxc/config: Update wording for profile/config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The same functions handle devices both as part of an instance and as
part of a profile. Up until now, a single usage was used for both but as
that was confusing, we're now duplicating some of the content to provide
more accurate usage instructions.

Closes #7851

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

diff --git a/lxc/config_device.go b/lxc/config_device.go
index 5399a9e86f..56b6182b05 100644
--- a/lxc/config_device.go
+++ b/lxc/config_device.go
@@ -20,9 +20,9 @@ type cmdConfigDevice struct {
 func (c *cmdConfigDevice) Command() *cobra.Command {
 	cmd := &cobra.Command{}
 	cmd.Use = i18n.G("device")
-	cmd.Short = i18n.G("Manage instance devices")
+	cmd.Short = i18n.G("Manage devices")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Manage instance devices`))
+		`Manage devices`))
 
 	// Add
 	configDeviceAddCmd := cmdConfigDeviceAdd{global: c.global, config: c.config, profile: c.profile, configDevice: c}
@@ -71,15 +71,16 @@ type cmdConfigDeviceAdd struct {
 
 func (c *cmdConfigDeviceAdd) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("add [<remote>:]<instance|profile> <device> <type> [key=value...]")
-	cmd.Short = i18n.G("Add devices to instances or profiles")
+	cmd.Short = i18n.G("Add instance devices")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Add devices to instances or profiles`))
+		`Add instance devices`))
 	if c.config != nil {
+		cmd.Use = i18n.G("add [<remote>:]<instance> <device> <type> [key=value...]")
 		cmd.Example = cli.FormatSection("", i18n.G(
 			`lxc config device add [<remote>:]instance1 <device-name> disk source=/share/c1 path=opt
     Will mount the host's /share/c1 onto /opt in the instance.`))
 	} else if c.profile != nil {
+		cmd.Use = i18n.G("add [<remote>:]<profile> <device> <type> [key=value...]")
 		cmd.Example = cli.FormatSection("", i18n.G(
 			`lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/c1 path=opt
     Will mount the host's /share/c1 onto /opt in the instance.`))
@@ -183,10 +184,14 @@ type cmdConfigDeviceGet struct {
 
 func (c *cmdConfigDeviceGet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("get [<remote>:]<instance|profile> <device> <key>")
-	cmd.Short = i18n.G("Get values for instance device configuration keys")
+	if c.config != nil {
+		cmd.Use = i18n.G("get [<remote>:]<instance> <device> <key>")
+	} else if c.profile != nil {
+		cmd.Use = i18n.G("get [<remote>:]<profile> <device> <key>")
+	}
+	cmd.Short = i18n.G("Get values for device configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Get values for instance device configuration keys`))
+		`Get values for device configuration keys`))
 
 	cmd.RunE = c.Run
 
@@ -255,11 +260,15 @@ type cmdConfigDeviceList struct {
 
 func (c *cmdConfigDeviceList) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("list [<remote>:]<instance|profile>")
 	cmd.Aliases = []string{"ls"}
 	cmd.Short = i18n.G("List instance devices")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`List instance devices`))
+	if c.config != nil {
+		cmd.Use = i18n.G("list [<remote>:]<instance>")
+	} else if c.profile != nil {
+		cmd.Use = i18n.G("list [<remote>:]<profile>")
+	}
 
 	cmd.RunE = c.Run
 
@@ -410,7 +419,11 @@ type cmdConfigDeviceRemove struct {
 
 func (c *cmdConfigDeviceRemove) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("remove [<remote>:]<instance|profile> <name>...")
+	if c.config != nil {
+		cmd.Use = i18n.G("remove [<remote>:]<instance> <name>...")
+	} else if c.profile != nil {
+		cmd.Use = i18n.G("remove [<remote>:]<profile> <name>...")
+	}
 	cmd.Aliases = []string{"rm"}
 	cmd.Short = i18n.G("Remove instance devices")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
@@ -501,17 +514,18 @@ type cmdConfigDeviceSet struct {
 
 func (c *cmdConfigDeviceSet) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("set [<remote>:]<instance|profile> <device> <key>=<value>...")
-	cmd.Short = i18n.G("Set instance device configuration keys")
+	cmd.Short = i18n.G("Set device configuration keys")
 	if c.config != nil {
+		cmd.Use = i18n.G("set [<remote>:]<instance> <device> <key>=<value>...")
 		cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-			`Set instance device configuration keys
+			`Set device configuration keys
 
 For backward compatibility, a single configuration key may still be set with:
     lxc config device set [<remote>:]<instance> <device> <key> <value>`))
 	} else if c.profile != nil {
+		cmd.Use = i18n.G("set [<remote>:]<profile> <device> <key>=<value>...")
 		cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-			`Set instance device configuration keys
+			`Set device configuration keys
 
 For backward compatibility, a single configuration key may still be set with:
     lxc profile device set [<remote>:]<profile> <device> <key> <value>`))
@@ -608,10 +622,14 @@ type cmdConfigDeviceShow struct {
 
 func (c *cmdConfigDeviceShow) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("show [<remote>:]<instance|profile>")
-	cmd.Short = i18n.G("Show full device configuration for instances or profiles")
+	if c.config != nil {
+		cmd.Use = i18n.G("show [<remote>:]<instance>")
+	} else if c.profile != nil {
+		cmd.Use = i18n.G("show [<remote>:]<profile>")
+	}
+	cmd.Short = i18n.G("Show full device configuration")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Show full device configuration for instances or profiles`))
+		`Show full device configuration`))
 
 	cmd.RunE = c.Run
 
@@ -676,10 +694,14 @@ type cmdConfigDeviceUnset struct {
 
 func (c *cmdConfigDeviceUnset) Command() *cobra.Command {
 	cmd := &cobra.Command{}
-	cmd.Use = i18n.G("unset [<remote>:]<instance|profile> <device> <key>")
-	cmd.Short = i18n.G("Unset instance device configuration keys")
+	if c.config != nil {
+		cmd.Use = i18n.G("unset [<remote>:]<instance> <device> <key>")
+	} else if c.profile != nil {
+		cmd.Use = i18n.G("unset [<remote>:]<profile> <device> <key>")
+	}
+	cmd.Short = i18n.G("Unset device configuration keys")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
-		`Unset instance device configuration keys`))
+		`Unset device configuration keys`))
 
 	cmd.RunE = c.Run
 

From 0c5654039abba595e6f7da86be8dc13ee8b45505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 9 Sep 2020 14:20:58 -0400
Subject: [PATCH 2/2] 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      | 220 +++++++++++++++++++++-------------------
 po/ca.po      | 220 +++++++++++++++++++++-------------------
 po/de.po      | 265 +++++++++++++++++++++++++++---------------------
 po/el.po      | 220 +++++++++++++++++++++-------------------
 po/es.po      | 232 +++++++++++++++++++++++-------------------
 po/fa.po      | 220 +++++++++++++++++++++-------------------
 po/fi.po      | 220 +++++++++++++++++++++-------------------
 po/fr.po      | 271 +++++++++++++++++++++++++++++---------------------
 po/hi.po      | 220 +++++++++++++++++++++-------------------
 po/id.po      | 220 +++++++++++++++++++++-------------------
 po/it.po      | 237 +++++++++++++++++++++++--------------------
 po/ja.po      | 255 ++++++++++++++++++++++++++++-------------------
 po/ko.po      | 220 +++++++++++++++++++++-------------------
 po/lxd.pot    | 138 +++++++++++++------------
 po/nb_NO.po   | 220 +++++++++++++++++++++-------------------
 po/nl.po      | 220 +++++++++++++++++++++-------------------
 po/pa.po      | 220 +++++++++++++++++++++-------------------
 po/pl.po      | 220 +++++++++++++++++++++-------------------
 po/pt_BR.po   | 227 +++++++++++++++++++++++-------------------
 po/ru.po      | 260 ++++++++++++++++++++++++++++--------------------
 po/sl.po      | 220 +++++++++++++++++++++-------------------
 po/sr.po      | 220 +++++++++++++++++++++-------------------
 po/sv.po      | 220 +++++++++++++++++++++-------------------
 po/te.po      | 220 +++++++++++++++++++++-------------------
 po/tr.po      | 220 +++++++++++++++++++++-------------------
 po/ug.po      | 220 +++++++++++++++++++++-------------------
 po/uk.po      | 220 +++++++++++++++++++++-------------------
 po/zh_Hans.po | 220 +++++++++++++++++++++-------------------
 28 files changed, 3431 insertions(+), 2854 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 01d476884b..0377b213ab 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index dad41bc993..29ef79a0ba 100644
--- a/po/ca.po
+++ b/po/ca.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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 680c23c7d0..3efe58cf34 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: 2020-04-27 19:48+0000\n"
 "Last-Translator: Predatorix Phoenix <predatorix at web.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -369,7 +369,7 @@ msgstr "--refresh kann nur mit Containern verwendet werden"
 msgid "--target cannot be used with instances"
 msgstr "--refresh kann nur mit Containern verwendet werden"
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -398,10 +398,10 @@ msgstr "Profil %s erstellt\n"
 msgid "Action (defaults to GET)"
 msgstr "Aktion (Standard: GET)"
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
+#: lxc/config_device.go:74 lxc/config_device.go:75
 #, fuzzy
-msgid "Add devices to instances or profiles"
-msgstr "Geräte zu Containern oder Profilen hinzufügen"
+msgid "Add instance devices"
+msgstr "kann nicht zum selben Container Namen kopieren"
 
 #: lxc/alias.go:53 lxc/alias.go:54
 #, fuzzy
@@ -825,7 +825,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
@@ -1057,11 +1057,11 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1070,39 +1070,39 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1124,17 +1124,17 @@ msgstr "Profil %s erstellt\n"
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, fuzzy, c-format
 msgid "Device %s added to %s"
 msgstr "Gerät %s wurde zu %s hinzugefügt\n"
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, fuzzy, c-format
 msgid "Device %s overridden for %s"
 msgstr "Gerät %s wurde von %s entfernt\n"
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, fuzzy, c-format
 msgid "Device %s removed from %s"
 msgstr "Gerät %s wurde von %s entfernt\n"
@@ -1384,8 +1384,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr "FINGERABDRUCK"
 
@@ -1476,7 +1476,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1519,9 +1519,9 @@ msgstr "Generiere Nutzerzertifikat. Dies kann wenige Minuten dauern...\n"
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
+#: lxc/config_device.go:192 lxc/config_device.go:193
 #, fuzzy
-msgid "Get values for instance device configuration keys"
+msgid "Get values for device configuration keys"
 msgstr "Profil %s erstellt\n"
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1896,7 +1896,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 #, fuzzy
 msgid "List instance devices"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -2086,6 +2086,11 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr "Unbekannter Befehl %s für Abbild"
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage devices"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
 #: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
 msgid "Manage files in instances"
@@ -2125,11 +2130,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr "Alternatives config Verzeichnis."
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-#, fuzzy
-msgid "Manage instance devices"
-msgstr "kann nicht zum selben Container Namen kopieren"
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 #, fuzzy
 msgid "Manage instance file templates"
@@ -2233,9 +2233,9 @@ msgstr "der Name des Ursprung Containers muss angegeben werden"
 msgid "Missing instance name"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 #, fuzzy
 msgid "Missing name"
 msgstr "Fehlende Zusammenfassung."
@@ -2456,7 +2456,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, fuzzy, c-format
 msgid "No value found in %q"
 msgstr "kein Wert in %q gefunden\n"
@@ -2813,7 +2813,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr "Entferntes Administrator Passwort"
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 #, fuzzy
 msgid "Remove instance devices"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -2997,23 +2997,23 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
+#: lxc/config_device.go:517
 #, fuzzy
-msgid "Set instance device configuration keys"
+msgid "Set device configuration keys"
 msgstr "Alternatives config Verzeichnis."
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -3139,9 +3139,9 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
+#: lxc/config_device.go:630 lxc/config_device.go:631
 #, fuzzy
-msgid "Show full device configuration for instances or profiles"
+msgid "Show full device configuration"
 msgstr "Geräte zu Containern oder Profilen hinzufügen"
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3372,7 +3372,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3393,13 +3393,13 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 #, fuzzy
 msgid "The device already exists"
 msgstr "entfernte Instanz %s existiert bereits"
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 #, fuzzy
 msgid "The device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
@@ -3428,7 +3428,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 #, fuzzy
 msgid "The profile device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
@@ -3590,9 +3590,9 @@ msgstr "Unbekannter Befehl %s für Abbild"
 msgid "Unset all profiles on the target instance"
 msgstr "nicht alle Profile der Quelle sind am Ziel vorhanden."
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
+#: lxc/config_device.go:702 lxc/config_device.go:703
 #, fuzzy
-msgid "Unset instance device configuration keys"
+msgid "Unset device configuration keys"
 msgstr "Alternatives config Verzeichnis."
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3739,6 +3739,14 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
 #: lxc/profile.go:99
 #, fuzzy
 msgid "add [<remote>:]<instance> <profile>"
@@ -3748,9 +3756,9 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_device.go:74
+#: lxc/config_device.go:83
 #, fuzzy
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4093,9 +4101,9 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
+#: lxc/config_device.go:188
 #, fuzzy
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4118,6 +4126,14 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
+#: lxc/config_device.go:190
+#, fuzzy
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -4210,7 +4226,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr ""
@@ -4218,18 +4234,18 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/config_device.go:258
+#: lxc/storage_volume.go:1078
+msgid "list [<remote>:]<pool>"
+msgstr ""
+
+#: lxc/config_device.go:270
 #, fuzzy
-msgid "list [<remote>:]<instance|profile>"
+msgid "list [<remote>:]<profile>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
-msgstr ""
-
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -4404,7 +4420,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4519,7 +4535,7 @@ msgstr "OK (y/n)? "
 msgid "operation"
 msgstr "Eigenschaften:\n"
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 #, fuzzy
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
@@ -4607,17 +4623,17 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
+#: lxc/config_device.go:423
 #, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/config_device.go:413
+#: lxc/profile.go:634
 #, fuzzy
-msgid "remove [<remote>:]<instance|profile> <name>..."
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4627,6 +4643,14 @@ msgstr ""
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4701,9 +4725,9 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_device.go:504
+#: lxc/config_device.go:519
 #, fuzzy
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4729,6 +4753,14 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
 #: lxc/profile.go:760
 #, fuzzy
 msgid "set [<remote>:]<profile> <key><value>..."
@@ -4761,7 +4793,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr ""
@@ -4779,15 +4811,6 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/config_device.go:611
-#, fuzzy
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4813,7 +4836,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4913,9 +4936,9 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
+#: lxc/config_device.go:698
 #, fuzzy
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
@@ -4933,6 +4956,14 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+#, fuzzy
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
@@ -4974,6 +5005,18 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Add devices to instances or profiles"
+#~ msgstr "Geräte zu Containern oder Profilen hinzufügen"
+
+#, fuzzy
+#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgstr ""
+#~ "Löscht einen Container oder Container Sicherungspunkt.\n"
+#~ "\n"
+#~ "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+#~ "Daten (Konfiguration, Sicherungspunkte, ...).\n"
+
 #, fuzzy
 #~ msgid "Show storage volum configurations"
 #~ msgstr "Profil %s erstellt\n"
diff --git a/po/el.po b/po/el.po
index 11195778eb..23e171c2c5 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-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/"
@@ -242,7 +242,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -270,8 +270,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -668,7 +668,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -806,7 +806,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -879,11 +879,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -892,39 +892,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -944,17 +944,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1186,8 +1186,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1272,7 +1272,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1314,8 +1314,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1678,7 +1678,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1843,6 +1843,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1878,10 +1882,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1979,9 +1979,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2190,7 +2190,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2536,7 +2536,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2707,22 +2707,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2843,8 +2843,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3062,7 +3062,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3083,12 +3083,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3116,7 +3116,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3272,8 +3272,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3405,12 +3405,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3666,8 +3670,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3682,6 +3686,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3757,18 +3765,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3939,7 +3947,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4043,7 +4051,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4104,18 +4112,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4166,8 +4178,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4182,6 +4194,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4202,7 +4218,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4210,10 +4226,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4234,7 +4246,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4307,8 +4319,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4323,6 +4335,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 258f1d9495..db09da14e4 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-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/"
@@ -365,7 +365,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -393,8 +393,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr "Accion (predeterminados a GET)"
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -797,7 +797,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -941,7 +941,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr "DESCRIPCIÓN"
@@ -1015,11 +1015,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1028,39 +1028,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1080,17 +1080,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr "Dispositivo %s añadido a %s"
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1323,8 +1323,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr "HUELLA DIGITAL"
 
@@ -1410,7 +1410,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1452,8 +1452,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1819,7 +1819,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1985,6 +1985,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -2020,10 +2024,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -2121,9 +2121,9 @@ msgstr "Nombre del Miembro del Cluster"
 msgid "Missing instance name"
 msgstr "Nombre del contenedor es: %s"
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2332,7 +2332,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2681,7 +2681,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2855,22 +2855,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2991,8 +2991,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3210,7 +3210,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3231,12 +3231,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3264,7 +3264,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3420,8 +3420,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3553,14 +3553,19 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/profile.go:99
 #, fuzzy
 msgid "add [<remote>:]<instance> <profile>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:74
+#: lxc/config_device.go:83
 #, fuzzy
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/remote.go:82
@@ -3826,9 +3831,9 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
+#: lxc/config_device.go:188
 #, fuzzy
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:670
@@ -3843,6 +3848,11 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+#, fuzzy
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3920,20 +3930,20 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:258
-#, fuzzy
-msgid "list [<remote>:]<instance|profile>"
-msgstr "No se puede proveer el nombre del container a la lista"
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+#, fuzzy
+msgid "list [<remote>:]<profile>"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -4104,7 +4114,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4209,7 +4219,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 #, fuzzy
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -4272,20 +4282,25 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
+#: lxc/config_device.go:423
 #, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:413
+#: lxc/profile.go:634
 #, fuzzy
-msgid "remove [<remote>:]<instance|profile> <name>..."
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4339,9 +4354,9 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
+#: lxc/config_device.go:519
 #, fuzzy
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:1022
@@ -4356,6 +4371,11 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4377,7 +4397,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -4387,11 +4407,6 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "show [<remote>:]<instance> <template>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/config_device.go:611
-#, fuzzy
-msgid "show [<remote>:]<instance|profile>"
-msgstr "No se puede proveer el nombre del container a la lista"
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4412,7 +4427,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4490,9 +4505,9 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
+#: lxc/config_device.go:698
 #, fuzzy
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
 #: lxc/network.go:1154
@@ -4507,6 +4522,11 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+#, fuzzy
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr "No se puede proveer el nombre del container a la lista"
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
@@ -4542,6 +4562,10 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
+#, fuzzy
+#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgstr "No se puede proveer el nombre del container a la lista"
+
 #~ msgid "Commands:"
 #~ msgstr "Comandos:"
 
diff --git a/po/fa.po b/po/fa.po
index 866c1204f1..b3341bb2cd 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index d8f655e8aa..39b9c4de98 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 4e1a7f5966..a7755b7abf 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-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/"
@@ -364,7 +364,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -395,9 +395,10 @@ msgstr "Afficher la configuration étendue"
 msgid "Action (defaults to GET)"
 msgstr "Action (GET par défaut)"
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
-msgstr ""
+#: lxc/config_device.go:74 lxc/config_device.go:75
+#, fuzzy
+msgid "Add instance devices"
+msgstr "Création du conteneur"
 
 #: lxc/alias.go:53 lxc/alias.go:54
 #, fuzzy
@@ -816,7 +817,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr "Copiez le conteneur sans ses instantanés"
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -987,7 +988,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -1067,11 +1068,11 @@ msgstr "Copie de l'image : %s"
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1080,39 +1081,39 @@ msgstr "Copie de l'image : %s"
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1133,17 +1134,17 @@ msgstr "Clé de configuration invalide"
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr "Périphérique %s ajouté à %s"
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, fuzzy, c-format
 msgid "Device %s overridden for %s"
 msgstr "Périphérique %s retiré de %s"
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr "Périphérique %s retiré de %s"
@@ -1397,8 +1398,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr "NOM"
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
@@ -1488,7 +1489,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1530,9 +1531,9 @@ msgstr "Génération d'un certificat client. Ceci peut prendre une minute…"
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
+#: lxc/config_device.go:192 lxc/config_device.go:193
 #, fuzzy
-msgid "Get values for instance device configuration keys"
+msgid "Get values for device configuration keys"
 msgstr "Clé de configuration invalide"
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1913,7 +1914,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 #, fuzzy
 msgid "List instance devices"
 msgstr "Création du conteneur"
@@ -2142,6 +2143,11 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage devices"
+msgstr "Création du conteneur"
+
 #: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
 msgid "Manage files in instances"
@@ -2181,11 +2187,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr "Clé de configuration invalide"
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-#, fuzzy
-msgid "Manage instance devices"
-msgstr "Création du conteneur"
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 #, fuzzy
 msgid "Manage instance file templates"
@@ -2291,9 +2292,9 @@ msgstr "Vous devez fournir le nom d'un conteneur pour : "
 msgid "Missing instance name"
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 #, fuzzy
 msgid "Missing name"
 msgstr "Résumé manquant."
@@ -2517,7 +2518,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2883,7 +2884,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr "Mot de passe de l'administrateur distant"
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 #, fuzzy
 msgid "Remove instance devices"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -3069,23 +3070,23 @@ msgstr "Protocole du serveur (lxd ou simplestreams)"
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
+#: lxc/config_device.go:517
 #, fuzzy
-msgid "Set instance device configuration keys"
+msgid "Set device configuration keys"
 msgstr "Clé de configuration invalide"
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -3213,9 +3214,10 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
-msgstr ""
+#: lxc/config_device.go:630 lxc/config_device.go:631
+#, fuzzy
+msgid "Show full device configuration"
+msgstr "Afficher la configuration étendue"
 
 #: lxc/image.go:1351 lxc/image.go:1352
 msgid "Show image properties"
@@ -3453,7 +3455,7 @@ msgstr "impossible de supprimer le serveur distant par défaut"
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr "TYPE"
@@ -3474,13 +3476,13 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 #, fuzzy
 msgid "The device already exists"
 msgstr "Le périphérique n'existe pas"
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr "Le périphérique n'existe pas"
 
@@ -3515,7 +3517,7 @@ msgstr "L'image locale '%s' n'a pas été trouvée, essayer '%s:' à la place."
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr "L'image locale '%s' n'a pas été trouvée, essayer '%s:' à la place."
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 #, fuzzy
 msgid "The profile device doesn't exist"
 msgstr "Le périphérique indiqué n'existe pas"
@@ -3677,9 +3679,9 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr "tous les profils de la source n'existent pas sur la cible"
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
+#: lxc/config_device.go:702 lxc/config_device.go:703
 #, fuzzy
-msgid "Unset instance device configuration keys"
+msgid "Unset device configuration keys"
 msgstr "Clé de configuration invalide"
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3826,6 +3828,14 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/profile.go:99
 #, fuzzy
 msgid "add [<remote>:]<instance> <profile>"
@@ -3838,9 +3848,9 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/config_device.go:74
+#: lxc/config_device.go:83
 #, fuzzy
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -4206,9 +4216,9 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
+#: lxc/config_device.go:188
 #, fuzzy
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -4234,6 +4244,14 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
+#: lxc/config_device.go:190
+#, fuzzy
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -4330,7 +4348,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr ""
@@ -4338,18 +4356,18 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:258
+#: lxc/storage_volume.go:1078
+msgid "list [<remote>:]<pool>"
+msgstr ""
+
+#: lxc/config_device.go:270
 #, fuzzy
-msgid "list [<remote>:]<instance|profile>"
+msgid "list [<remote>:]<profile>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
-msgstr ""
-
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -4542,7 +4560,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4660,7 +4678,7 @@ msgstr "ok (y/n) ?"
 msgid "operation"
 msgstr "Propriétés :"
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 #, fuzzy
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
@@ -4752,17 +4770,17 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
+#: lxc/config_device.go:423
 #, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:413
+#: lxc/profile.go:634
 #, fuzzy
-msgid "remove [<remote>:]<instance|profile> <name>..."
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -4772,6 +4790,14 @@ msgstr ""
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4858,9 +4884,9 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/config_device.go:504
+#: lxc/config_device.go:519
 #, fuzzy
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -4886,6 +4912,14 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/profile.go:760
 #, fuzzy
 msgid "set [<remote>:]<profile> <key><value>..."
@@ -4918,7 +4952,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr ""
@@ -4942,18 +4976,6 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/config_device.go:611
-#, fuzzy
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4982,7 +5004,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -5089,9 +5111,9 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
+#: lxc/config_device.go:698
 #, fuzzy
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
@@ -5109,6 +5131,14 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+#, fuzzy
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
@@ -5151,6 +5181,17 @@ msgstr ""
 msgid "yes"
 msgstr "oui"
 
+#, fuzzy
+#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgstr ""
+#~ "Supprimer des conteneurs ou des instantanés.\n"
+#~ "\n"
+#~ "lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+#~ "<snapshot>]...]\n"
+#~ "\n"
+#~ "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+#~ "(configuration, instantanés, …)."
+
 #, fuzzy
 #~ msgid "Show storage volum configurations"
 #~ msgstr "Afficher la configuration étendue"
diff --git a/po/hi.po b/po/hi.po
index 248bb4b975..211526d9d3 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index b71d9948bd..ba38d1398e 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index b6cc330abb..c7840302ba 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-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/"
@@ -356,7 +356,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -384,9 +384,10 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr "Azione (default a GET)"
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
-msgstr ""
+#: lxc/config_device.go:74 lxc/config_device.go:75
+#, fuzzy
+msgid "Add instance devices"
+msgstr "Creazione del container in corso"
 
 #: lxc/alias.go:53 lxc/alias.go:54
 msgid "Add new aliases"
@@ -783,7 +784,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -928,7 +929,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr "DESCRIZIONE"
@@ -1003,11 +1004,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1016,39 +1017,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1068,17 +1069,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1312,8 +1313,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1399,7 +1400,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1441,8 +1442,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1809,7 +1810,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 #, fuzzy
 msgid "List instance devices"
 msgstr "Creazione del container in corso"
@@ -1976,6 +1977,11 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage devices"
+msgstr "Creazione del container in corso"
+
 #: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
 msgid "Manage files in instances"
@@ -2012,11 +2018,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-#, fuzzy
-msgid "Manage instance devices"
-msgstr "Creazione del container in corso"
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -2115,9 +2116,9 @@ msgstr "Il nome del container è: %s"
 msgid "Missing instance name"
 msgstr "Il nome del container è: %s"
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2325,7 +2326,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2674,7 +2675,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 #, fuzzy
 msgid "Remove instance devices"
 msgstr "Creazione del container in corso"
@@ -2849,22 +2850,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2985,8 +2986,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3206,7 +3207,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3227,12 +3228,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr "La periferica esiste già"
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3260,7 +3261,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 #, fuzzy
 msgid "The profile device doesn't exist"
 msgstr "il remote %s non esiste"
@@ -3418,8 +3419,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr "non tutti i profili dell'origine esistono nella destinazione"
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3553,14 +3554,19 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr "Creazione del container in corso"
+
 #: lxc/profile.go:99
 #, fuzzy
 msgid "add [<remote>:]<instance> <profile>"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:74
+#: lxc/config_device.go:83
 #, fuzzy
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr "Creazione del container in corso"
 
 #: lxc/remote.go:82
@@ -3826,9 +3832,9 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
+#: lxc/config_device.go:188
 #, fuzzy
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr "Creazione del container in corso"
 
 #: lxc/network.go:670
@@ -3843,6 +3849,11 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+#, fuzzy
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr "Creazione del container in corso"
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3920,20 +3931,20 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:258
-#, fuzzy
-msgid "list [<remote>:]<instance|profile>"
-msgstr "Creazione del container in corso"
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+#, fuzzy
+msgid "list [<remote>:]<profile>"
+msgstr "Creazione del container in corso"
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -4104,7 +4115,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4209,7 +4220,7 @@ msgstr "ok (y/n)?"
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 #, fuzzy
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr "Creazione del container in corso"
@@ -4272,20 +4283,25 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
+#: lxc/config_device.go:423
 #, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:413
+#: lxc/profile.go:634
 #, fuzzy
-msgid "remove [<remote>:]<instance|profile> <name>..."
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr "Creazione del container in corso"
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr "Creazione del container in corso"
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4339,9 +4355,9 @@ msgstr "Creazione del container in corso"
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
+#: lxc/config_device.go:519
 #, fuzzy
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr "Creazione del container in corso"
 
 #: lxc/network.go:1022
@@ -4356,6 +4372,11 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr "Creazione del container in corso"
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4377,7 +4398,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr "Creazione del container in corso"
@@ -4387,11 +4408,6 @@ msgstr "Creazione del container in corso"
 msgid "show [<remote>:]<instance> <template>"
 msgstr "Creazione del container in corso"
 
-#: lxc/config_device.go:611
-#, fuzzy
-msgid "show [<remote>:]<instance|profile>"
-msgstr "Creazione del container in corso"
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4412,7 +4428,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4490,9 +4506,9 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
+#: lxc/config_device.go:698
 #, fuzzy
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr "Creazione del container in corso"
 
 #: lxc/network.go:1154
@@ -4507,6 +4523,11 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+#, fuzzy
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr "Creazione del container in corso"
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
@@ -4542,6 +4563,10 @@ msgstr ""
 msgid "yes"
 msgstr "si"
 
+#, fuzzy
+#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgstr "Creazione del container in corso"
+
 #~ msgid "ARCH"
 #~ msgstr "ARCH"
 
diff --git a/po/ja.po b/po/ja.po
index 03a13390ff..45df5b1920 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: 2020-07-31 19:11+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -357,7 +357,7 @@ msgstr "--refresh はインスタンスの場合のみ使えます"
 msgid "--target cannot be used with instances"
 msgstr "--target はインスタンスでは使えません"
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -385,9 +385,10 @@ msgstr "拡張した設定を表示する"
 msgid "Action (defaults to GET)"
 msgstr "使用するHTTPのメソッド (デフォルト: GET)"
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
-msgstr "インスタンスもしくはプロファイルにデバイスを追加します"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+#, fuzzy
+msgid "Add instance devices"
+msgstr "インスタンスのデバイスを一覧表示します"
 
 #: lxc/alias.go:53 lxc/alias.go:54
 msgid "Add new aliases"
@@ -803,7 +804,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr "LXD サーバ内で、またはサーバ間でインスタンスをコピーします"
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr "プロファイルに継承されたデバイスをコピーし、設定キーを上書きします"
 
@@ -945,7 +946,7 @@ msgstr "現在の VF 数: %d"
 msgid "DATABASE"
 msgstr "DATABASE"
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -1018,11 +1019,11 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1031,39 +1032,39 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr "説明"
 
@@ -1083,17 +1084,17 @@ msgstr "インスタンスからストレージボリュームを取り外しま
 msgid "Detach storage volumes from profiles"
 msgstr "プロファイルからストレージボリュームを取り外します"
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr "デバイス %s が %s に追加されました"
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr "デバイス %s が %s で上書きされました"
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr "デバイス %s が %s から削除されました"
@@ -1351,8 +1352,8 @@ msgstr "FAILURE DOMAIN"
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr "FINGERPRINT"
 
@@ -1452,7 +1453,7 @@ msgstr ""
 "本当に強制的に %s を削除してもよろしいですか? (yes/no): "
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1494,8 +1495,9 @@ msgstr "クライアント証明書を生成します。1分ぐらいかかり
 msgid "Get runtime information on networks"
 msgstr "ネットワークのランタイム情報を取得します"
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+#, fuzzy
+msgid "Get values for device configuration keys"
 msgstr "インスタンスのデバイスの設定値を取得します"
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1897,7 +1899,7 @@ msgstr ""
 "    u - アップロード日\n"
 "    t - タイプ"
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr "インスタンスのデバイスを一覧表示します"
 
@@ -2125,6 +2127,11 @@ msgstr "クラスタのメンバを管理します"
 msgid "Manage command aliases"
 msgstr "コマンドのエイリアスを管理します"
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage devices"
+msgstr "インスタンスのデバイスを管理します"
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr "インスタンス内のファイルを管理します"
@@ -2173,10 +2180,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr "インスタンスやサーバの設定を管理します"
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr "インスタンスのデバイスを管理します"
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr "インスタンスのファイルテンプレートを管理します"
@@ -2276,9 +2279,9 @@ msgstr "クラスターメンバー名がありません"
 msgid "Missing instance name"
 msgstr "インスタンス名を指定する必要があります"
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr "名前を指定する必要があります"
 
@@ -2490,7 +2493,7 @@ msgstr "コピー元のボリュームに対するストレージプールが指
 msgid "No storage pool for target volume specified"
 msgstr "コピー先のボリュームに対するストレージプールが指定されていません"
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr "%q に設定する値が指定されていません"
@@ -2836,7 +2839,7 @@ msgstr "クラスタからメンバを削除します"
 msgid "Remove aliases"
 msgstr "エイリアスを削除します"
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr "インスタンスのデバイスを削除します"
 
@@ -3014,13 +3017,15 @@ msgstr "サーバのプロトコル (lxd or simplestreams)"
 msgid "Server version: %s\n"
 msgstr "サーバのバージョン: %s\n"
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+#, fuzzy
+msgid "Set device configuration keys"
 msgstr "インスタンスデバイスの設定項目を設定します"
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
+#, fuzzy
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -3031,9 +3036,10 @@ msgstr ""
 "後方互換性のため、単一の設定を行う場合は次の形式でも設定できます:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
+#, fuzzy
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -3182,9 +3188,10 @@ msgstr "クラスタメンバの詳細を表示します"
 msgid "Show details on a background operation"
 msgstr "バックグラウンド操作の詳細を表示します"
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
-msgstr "インスタンスもしくはプロファイルのデバイス設定をすべて表示します"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+#, fuzzy
+msgid "Show full device configuration"
+msgstr "プロファイルの設定を表示します"
 
 #: lxc/image.go:1351 lxc/image.go:1352
 msgid "Show image properties"
@@ -3401,7 +3408,7 @@ msgstr "デフォルトのリモートを切り替えます"
 msgid "TARGET"
 msgstr "TARGET"
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr "TYPE"
@@ -3422,12 +3429,12 @@ msgstr "--stateless と --target は同時に指定できません"
 msgid "The destination LXD server is not clustered"
 msgstr "移動先の LXD サーバはクラスタに属していません"
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr "デバイスはすでに存在します"
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr "デバイスが存在しません"
 
@@ -3460,7 +3467,7 @@ msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 "ローカルイメージ '%s' が見つかりません。代わりに '%s:' を試してみてください。"
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr "プロファイルのデバイスが存在しません"
 
@@ -3636,8 +3643,9 @@ msgstr "未知のファイルタイプ '%s'"
 msgid "Unset all profiles on the target instance"
 msgstr "移動先のインスタンスのすべてのプロファイルを削除します"
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+#, fuzzy
+msgid "Unset device configuration keys"
 msgstr "インスタンスデバイスの設定を削除します"
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3776,12 +3784,18 @@ msgstr "add <alias> <target>"
 msgid "add [<remote>:] <cert>"
 msgstr "add [<remote>:] <cert>"
 
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr "add [<remote>:]<instance> <profile>"
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+#, fuzzy
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
 
 #: lxc/remote.go:82
@@ -4045,8 +4059,9 @@ msgstr ""
 msgid "file"
 msgstr "file"
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+#, fuzzy
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr "get [<remote>:]<instance|profile> <device> <key>"
 
 #: lxc/network.go:670
@@ -4061,6 +4076,11 @@ msgstr "get [<remote>:]<pool> <key>"
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 
+#: lxc/config_device.go:190
+#, fuzzy
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr "get [<remote>:]<instance|profile> <device> <key>"
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr "get [<remote>:]<profile> <key>"
@@ -4138,18 +4158,19 @@ msgstr "list [<remote>:] [<filter>...]"
 msgid "list [<remote>:] [<filters>...]"
 msgstr "list [<remote>:] [<filters>...]"
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr "list [<remote>:]<instance>"
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr "list [<remote>:]<instance|profile>"
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr "list [<remote>:]<pool>"
 
+#: lxc/config_device.go:270
+#, fuzzy
+msgid "list [<remote>:]<profile>"
+msgstr "edit [<remote>:]<profile>"
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr "list-leases [<remote>:]<network>"
@@ -4409,7 +4430,7 @@ msgstr ""
 "lxc profile assign foo ''\n"
 "    \"foo\" からすべてのプロファイルを削除します。"
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4542,7 +4563,7 @@ msgstr "ok (y/n)?"
 msgid "operation"
 msgstr "operation"
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr "override [<remote>:]<instance> <device> [key=value...]"
 
@@ -4608,18 +4629,24 @@ msgstr "remove <remote>"
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr "remove [<remote>:] <hostname|fingerprint>"
 
+#: lxc/config_device.go:423
+#, fuzzy
+msgid "remove [<remote>:]<instance> <name>..."
+msgstr "remove [<remote>:]<instance|profile> <name>..."
+
 #: lxc/profile.go:634
 msgid "remove [<remote>:]<instance> <profile>"
 msgstr "remove [<remote>:]<instance> <profile>"
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
-msgstr "remove [<remote>:]<instance|profile> <name>..."
-
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr "remove [<remote>:]<member>"
 
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr "remove [<remote>:]<instance|profile> <name>..."
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr "rename <old alias> <new alias>"
@@ -4672,8 +4699,9 @@ msgstr "restore [<remote>:]<instance> <snapshot>"
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr "restore [<remote>:]<pool> <volume> <snapshot>"
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+#, fuzzy
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr "set [<remote>:]<instance|profile> <device> <key>=<value>..."
 
 #: lxc/network.go:1022
@@ -4688,6 +4716,11 @@ msgstr "set [<remote>:]<pool> <key> <value>"
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr "set [<remote>:]<pool> <volume> <key>=<value>..."
 
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr "set [<remote>:]<profile> <key><value>..."
@@ -4708,7 +4741,7 @@ msgstr "set-url <remote> <URL>"
 msgid "show [<remote>:]<image>"
 msgstr "show [<remote>:]<image>"
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr "show [<remote>:]<instance>"
 
@@ -4716,10 +4749,6 @@ msgstr "show [<remote>:]<instance>"
 msgid "show [<remote>:]<instance> <template>"
 msgstr "show [<remote>:]<instance> <template>"
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr "show [<remote>:]<instance|profile>"
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr "show [<remote>:]<member>"
@@ -4740,7 +4769,7 @@ msgstr "show [<remote>:]<pool>"
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr "show [<remote>:]<pool> <volume>[/<snapshot>]"
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr "show [<remote>:]<profile>"
 
@@ -4813,8 +4842,9 @@ msgstr "trust"
 msgid "unreachable"
 msgstr "サーバに接続できません"
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+#, fuzzy
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr "unset [<remote>:]<instance|profile> <device> <key>"
 
 #: lxc/network.go:1154
@@ -4829,6 +4859,11 @@ msgstr "unset [<remote>:]<pool> <key>"
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr "unset [<remote>:]<pool> <volume> <key>"
 
+#: lxc/config_device.go:700
+#, fuzzy
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr "unset [<remote>:]<instance|profile> <device> <key>"
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr "unset [<remote>:]<profile> <key>"
@@ -4862,6 +4897,18 @@ msgstr "y"
 msgid "yes"
 msgstr "yes"
 
+#~ msgid "Add devices to instances or profiles"
+#~ msgstr "インスタンスもしくはプロファイルにデバイスを追加します"
+
+#~ msgid "Show full device configuration for instances or profiles"
+#~ msgstr "インスタンスもしくはプロファイルのデバイス設定をすべて表示します"
+
+#~ msgid "list [<remote>:]<instance|profile>"
+#~ msgstr "list [<remote>:]<instance|profile>"
+
+#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgstr "show [<remote>:]<instance|profile>"
+
 #~ msgid "Show storage volum configurations"
 #~ msgstr "ストレージボリュームの設定を表示します"
 
diff --git a/po/ko.po b/po/ko.po
index 5c37a53989..35e33e7702 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/lxd.pot b/po/lxd.pot
index bdddbff029..384fc64e95 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-09-03 21:17+0200\n"
+        "POT-Creation-Date: 2020-09-09 14:18-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"
@@ -229,7 +229,7 @@ msgstr  ""
 msgid   "--target cannot be used with instances"
 msgstr  ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid   "ALIAS"
 msgstr  ""
 
@@ -257,8 +257,8 @@ msgstr  ""
 msgid   "Action (defaults to GET)"
 msgstr  ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid   "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid   "Add instance devices"
 msgstr  ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -634,7 +634,7 @@ msgstr  ""
 msgid   "Copy instances within or in between LXD servers"
 msgstr  ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid   "Copy profile inherited devices and override configuration keys"
 msgstr  ""
 
@@ -771,7 +771,7 @@ msgstr  ""
 msgid   "DATABASE"
 msgstr  ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883 lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883 lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid   "DESCRIPTION"
 msgstr  ""
 
@@ -839,7 +839,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:31 lxc/cluster.go:74 lxc/cluster.go:154 lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422 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.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452 lxc/config.go:610 lxc/config.go:734 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:36 lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223 lxc/storage_volume.go:310 lxc/storage_volume.go:472 lxc/storage_volume.go:551 lxc/storage_volume.go:627 lxc/storage_volume.go:709 lxc/storage_volume.go:790 lxc/storage_volume.go:990 lxc/storage_volume.go:1081 lxc/storage_volume.go:1161 lxc/storage_volume.go:1192 lxc/storage_volume.go:1305 lxc/storage_volume.go:1381 lxc/storage_volume.go:1480 lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154 lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422 lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452 lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24 lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265 lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520 lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703 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:36 lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223 lxc/storage_volume.go:310 lxc/storage_volume.go:472 lxc/storage_volume.go:551 lxc/storage_volume.go:627 lxc/storage_volume.go:709 lxc/storage_volume.go:790 lxc/storage_volume.go:990 lxc/storage_volume.go:1081 lxc/storage_volume.go:1161 lxc/storage_volume.go:1192 lxc/storage_volume.go:1305 lxc/storage_volume.go:1381 lxc/storage_volume.go:1480 lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -859,17 +859,17 @@ msgstr  ""
 msgid   "Detach storage volumes from profiles"
 msgstr  ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid   "Device %s added to %s"
 msgstr  ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid   "Device %s overridden for %s"
 msgstr  ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid   "Device %s removed from %s"
 msgstr  ""
@@ -1089,7 +1089,7 @@ msgstr  ""
 msgid   "FILENAME"
 msgstr  ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012 lxc/image_alias.go:232
 msgid   "FINGERPRINT"
 msgstr  ""
 
@@ -1168,7 +1168,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:76 lxc/config_template.go:238 lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001 lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104 lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510 lxc/storage_volume.go:1083
+#: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238 lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155 lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104 lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510 lxc/storage_volume.go:1083
 msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
@@ -1207,8 +1207,8 @@ msgstr  ""
 msgid   "Get runtime information on networks"
 msgstr  ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid   "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid   "Get values for device configuration keys"
 msgstr  ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1564,7 +1564,7 @@ msgid   "List images\n"
         "    t - Type"
 msgstr  ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid   "List instance devices"
 msgstr  ""
 
@@ -1723,6 +1723,10 @@ msgstr  ""
 msgid   "Manage command aliases"
 msgstr  ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid   "Manage devices"
+msgstr  ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid   "Manage files in instances"
 msgstr  ""
@@ -1757,10 +1761,6 @@ msgstr  ""
 msgid   "Manage instance and server configuration options"
 msgstr  ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid   "Manage instance devices"
-msgstr  ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid   "Manage instance file templates"
 msgstr  ""
@@ -1850,7 +1850,7 @@ msgstr  ""
 msgid   "Missing instance name"
 msgstr  ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285 lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541 lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294 lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555 lxc/config_device.go:655
 msgid   "Missing name"
 msgstr  ""
 
@@ -2039,7 +2039,7 @@ msgstr  ""
 msgid   "No storage pool for target volume specified"
 msgstr  ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid   "No value found in %q"
 msgstr  ""
@@ -2382,7 +2382,7 @@ msgstr  ""
 msgid   "Remove aliases"
 msgstr  ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid   "Remove instance devices"
 msgstr  ""
 
@@ -2550,19 +2550,19 @@ msgstr  ""
 msgid   "Server version: %s\n"
 msgstr  ""
 
-#: lxc/config_device.go:505
-msgid   "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid   "Set device configuration keys"
 msgstr  ""
 
-#: lxc/config_device.go:507
-msgid   "Set instance device configuration keys\n"
+#: lxc/config_device.go:520
+msgid   "Set device configuration keys\n"
         "\n"
         "For backward compatibility, a single configuration key may still be set with:\n"
         "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr  ""
 
-#: lxc/config_device.go:513
-msgid   "Set instance device configuration keys\n"
+#: lxc/config_device.go:527
+msgid   "Set device configuration keys\n"
         "\n"
         "For backward compatibility, a single configuration key may still be set with:\n"
         "    lxc profile device set [<remote>:]<profile> <device> <key> <value>"
@@ -2670,8 +2670,8 @@ msgstr  ""
 msgid   "Show details on a background operation"
 msgstr  ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid   "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid   "Show full device configuration"
 msgstr  ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -2889,7 +2889,7 @@ msgstr  ""
 msgid   "TARGET"
 msgstr  ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879 lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879 lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid   "TYPE"
 msgstr  ""
 
@@ -2909,11 +2909,11 @@ msgstr  ""
 msgid   "The destination LXD server is not clustered"
 msgstr  ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid   "The device already exists"
 msgstr  ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453 lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466 lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid   "The device doesn't exist"
 msgstr  ""
 
@@ -2939,7 +2939,7 @@ msgstr  ""
 msgid   "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr  ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid   "The profile device doesn't exist"
 msgstr  ""
 
@@ -3086,8 +3086,8 @@ msgstr  ""
 msgid   "Unset all profiles on the target instance"
 msgstr  ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid   "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid   "Unset device configuration keys"
 msgstr  ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3214,12 +3214,16 @@ msgstr  ""
 msgid   "add [<remote>:] <cert>"
 msgstr  ""
 
+#: lxc/config_device.go:78
+msgid   "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr  ""
+
 #: lxc/profile.go:99
 msgid   "add [<remote>:]<instance> <profile>"
 msgstr  ""
 
-#: lxc/config_device.go:74
-msgid   "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid   "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr  ""
 
 #: lxc/remote.go:82
@@ -3468,8 +3472,8 @@ msgstr  ""
 msgid   "file"
 msgstr  ""
 
-#: lxc/config_device.go:186
-msgid   "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid   "get [<remote>:]<instance> <device> <key>"
 msgstr  ""
 
 #: lxc/network.go:670
@@ -3484,6 +3488,10 @@ msgstr  ""
 msgid   "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr  ""
 
+#: lxc/config_device.go:190
+msgid   "get [<remote>:]<profile> <device> <key>"
+msgstr  ""
+
 #: lxc/profile.go:526
 msgid   "get [<remote>:]<profile> <key>"
 msgstr  ""
@@ -3556,18 +3564,18 @@ msgstr  ""
 msgid   "list [<remote>:] [<filters>...]"
 msgstr  ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid   "list [<remote>:]<instance>"
 msgstr  ""
 
-#: lxc/config_device.go:258
-msgid   "list [<remote>:]<instance|profile>"
-msgstr  ""
-
 #: lxc/storage_volume.go:1078
 msgid   "list [<remote>:]<pool>"
 msgstr  ""
 
+#: lxc/config_device.go:270
+msgid   "list [<remote>:]<profile>"
+msgstr  ""
+
 #: lxc/network.go:903
 msgid   "list-leases [<remote>:]<network>"
 msgstr  ""
@@ -3711,7 +3719,7 @@ msgid   "lxc profile assign foo default,bar\n"
         "    Remove all profile from \"foo\""
 msgstr  ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid   "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/c1 path=opt\n"
         "    Will mount the host's /share/c1 onto /opt in the instance."
 msgstr  ""
@@ -3802,7 +3810,7 @@ msgstr  ""
 msgid   "operation"
 msgstr  ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid   "override [<remote>:]<instance> <device> [key=value...]"
 msgstr  ""
 
@@ -3858,18 +3866,22 @@ msgstr  ""
 msgid   "remove [<remote>:] <hostname|fingerprint>"
 msgstr  ""
 
-#: lxc/profile.go:634
-msgid   "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid   "remove [<remote>:]<instance> <name>..."
 msgstr  ""
 
-#: lxc/config_device.go:413
-msgid   "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid   "remove [<remote>:]<instance> <profile>"
 msgstr  ""
 
 #: lxc/cluster.go:251
 msgid   "remove [<remote>:]<member>"
 msgstr  ""
 
+#: lxc/config_device.go:425
+msgid   "remove [<remote>:]<profile> <name>..."
+msgstr  ""
+
 #: lxc/alias.go:141
 msgid   "rename <old alias> <new alias>"
 msgstr  ""
@@ -3918,8 +3930,8 @@ msgstr  ""
 msgid   "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr  ""
 
-#: lxc/config_device.go:504
-msgid   "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid   "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr  ""
 
 #: lxc/network.go:1022
@@ -3934,6 +3946,10 @@ msgstr  ""
 msgid   "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr  ""
 
+#: lxc/config_device.go:526
+msgid   "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr  ""
+
 #: lxc/profile.go:760
 msgid   "set [<remote>:]<profile> <key><value>..."
 msgstr  ""
@@ -3954,7 +3970,7 @@ msgstr  ""
 msgid   "show [<remote>:]<image>"
 msgstr  ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid   "show [<remote>:]<instance>"
 msgstr  ""
 
@@ -3962,10 +3978,6 @@ msgstr  ""
 msgid   "show [<remote>:]<instance> <template>"
 msgstr  ""
 
-#: lxc/config_device.go:611
-msgid   "show [<remote>:]<instance|profile>"
-msgstr  ""
-
 #: lxc/cluster.go:152
 msgid   "show [<remote>:]<member>"
 msgstr  ""
@@ -3986,7 +3998,7 @@ msgstr  ""
 msgid   "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr  ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid   "show [<remote>:]<profile>"
 msgstr  ""
 
@@ -4059,8 +4071,8 @@ msgstr  ""
 msgid   "unreachable"
 msgstr  ""
 
-#: lxc/config_device.go:679
-msgid   "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid   "unset [<remote>:]<instance> <device> <key>"
 msgstr  ""
 
 #: lxc/network.go:1154
@@ -4075,6 +4087,10 @@ msgstr  ""
 msgid   "unset [<remote>:]<pool> <volume> <key>"
 msgstr  ""
 
+#: lxc/config_device.go:700
+msgid   "unset [<remote>:]<profile> <device> <key>"
+msgstr  ""
+
 #: lxc/profile.go:873
 msgid   "unset [<remote>:]<profile> <key>"
 msgstr  ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 88a4ca689c..7c5e5a53a0 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index d2b413d968..3a3349fbcb 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-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/"
@@ -356,7 +356,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -384,8 +384,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -781,7 +781,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -919,7 +919,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -992,11 +992,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1005,39 +1005,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1057,17 +1057,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1296,8 +1296,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1382,7 +1382,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1424,8 +1424,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1788,7 +1788,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1953,6 +1953,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1988,10 +1992,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -2087,9 +2087,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2296,7 +2296,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2642,7 +2642,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2813,22 +2813,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2949,8 +2949,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3168,7 +3168,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3189,12 +3189,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3222,7 +3222,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3378,8 +3378,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3511,12 +3511,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3772,8 +3776,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3788,6 +3792,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3863,18 +3871,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -4045,7 +4053,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4149,7 +4157,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4210,18 +4218,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4272,8 +4284,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4288,6 +4300,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4308,7 +4324,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4316,10 +4332,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4340,7 +4352,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4413,8 +4425,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4429,6 +4441,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 2e52266b14..6defb14bb3 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 5cfdd9e706..cf7253c889 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-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/"
@@ -366,7 +366,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -394,8 +394,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -791,7 +791,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -929,7 +929,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -1002,11 +1002,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1015,39 +1015,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1067,17 +1067,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1306,8 +1306,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1392,7 +1392,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1434,8 +1434,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1798,7 +1798,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1963,6 +1963,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1998,10 +2002,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -2097,9 +2097,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2306,7 +2306,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2652,7 +2652,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2823,22 +2823,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2959,8 +2959,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3178,7 +3178,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3199,12 +3199,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3232,7 +3232,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3388,8 +3388,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3521,12 +3521,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3782,8 +3786,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3798,6 +3802,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3873,18 +3881,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -4055,7 +4063,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4159,7 +4167,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4220,18 +4228,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4282,8 +4294,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4298,6 +4310,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4318,7 +4334,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4326,10 +4342,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4350,7 +4362,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4423,8 +4435,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4439,6 +4451,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ffc15f034c..982d4e6684 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-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/"
@@ -372,7 +372,7 @@ msgstr "--refresh só pode ser usado com containers"
 msgid "--target cannot be used with instances"
 msgstr "--refresh só pode ser usado com containers"
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -401,10 +401,10 @@ msgstr "Editar configurações de perfil como YAML"
 msgid "Action (defaults to GET)"
 msgstr "Ação (padrão para o GET)"
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
+#: lxc/config_device.go:74 lxc/config_device.go:75
 #, fuzzy
-msgid "Add devices to instances or profiles"
-msgstr "Adicionar dispositivos aos containers ou perfis"
+msgid "Add instance devices"
+msgstr "Editar arquivos de metadados do container"
 
 #: lxc/alias.go:53 lxc/alias.go:54
 msgid "Add new aliases"
@@ -815,7 +815,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr "Copiar imagens entre servidores"
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -962,7 +962,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -1039,11 +1039,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1052,39 +1052,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr "Descrição"
 
@@ -1106,17 +1106,17 @@ msgstr "Desconectar volumes de armazenamento dos containers"
 msgid "Detach storage volumes from profiles"
 msgstr "Desconectar volumes de armazenamento dos perfis"
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr "Dispositivo %s adicionado a %s"
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr "Dispositivo %s sobreposto em %s"
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr "Dispositivo %s removido de %s"
@@ -1353,8 +1353,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1439,7 +1439,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1481,9 +1481,9 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
+#: lxc/config_device.go:192 lxc/config_device.go:193
 #, fuzzy
-msgid "Get values for instance device configuration keys"
+msgid "Get values for device configuration keys"
 msgstr "Editar configurações de perfil como YAML"
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1850,7 +1850,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -2016,6 +2016,11 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage devices"
+msgstr "Editar arquivos no container"
+
 #: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
 msgid "Manage files in instances"
@@ -2053,10 +2058,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr "Editar configurações do container ou do servidor como YAML"
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 #, fuzzy
 msgid "Manage instance file templates"
@@ -2155,9 +2156,9 @@ msgstr "Nome de membro do cluster"
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2364,7 +2365,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2715,7 +2716,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2888,23 +2889,23 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
+#: lxc/config_device.go:517
 #, fuzzy
-msgid "Set instance device configuration keys"
+msgid "Set device configuration keys"
 msgstr "Editar configurações de perfil como YAML"
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -3028,9 +3029,9 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
+#: lxc/config_device.go:630 lxc/config_device.go:631
 #, fuzzy
-msgid "Show full device configuration for instances or profiles"
+msgid "Show full device configuration"
 msgstr "Adicionar dispositivos aos containers ou perfis"
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3252,7 +3253,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3273,12 +3274,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3306,7 +3307,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3463,9 +3464,9 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr "Não pode fornecer um nome para a imagem de destino"
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
+#: lxc/config_device.go:702 lxc/config_device.go:703
 #, fuzzy
-msgid "Unset instance device configuration keys"
+msgid "Unset device configuration keys"
 msgstr "Editar configurações de perfil como YAML"
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3599,12 +3600,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3860,8 +3865,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3876,6 +3881,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3951,18 +3960,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -4133,7 +4142,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4237,7 +4246,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4298,18 +4307,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4360,8 +4373,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4376,6 +4389,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4396,7 +4413,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4404,10 +4421,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4428,7 +4441,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4501,8 +4514,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4517,6 +4530,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
@@ -4550,6 +4567,10 @@ msgstr ""
 msgid "yes"
 msgstr "sim"
 
+#, fuzzy
+#~ msgid "Add devices to instances or profiles"
+#~ msgstr "Adicionar dispositivos aos containers ou perfis"
+
 #~ msgid "ARCH"
 #~ msgstr "ARQUITETURA"
 
diff --git a/po/ru.po b/po/ru.po
index e21dc5d6b7..8afa7f9f97 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: 2020-08-02 01:42+0000\n"
 "Last-Translator: Anthony <aemeltsev at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -367,7 +367,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr "ПСЕВДОНИМ"
 
@@ -396,9 +396,10 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
-msgstr ""
+#: lxc/config_device.go:74 lxc/config_device.go:75
+#, fuzzy
+msgid "Add instance devices"
+msgstr "Копирование образа: %s"
 
 #: lxc/alias.go:53 lxc/alias.go:54
 #, fuzzy
@@ -798,7 +799,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -947,7 +948,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -1024,11 +1025,11 @@ msgstr "Копирование образа: %s"
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -1037,39 +1038,39 @@ msgstr "Копирование образа: %s"
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -1090,17 +1091,17 @@ msgstr "Копирование образа: %s"
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1337,8 +1338,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1423,7 +1424,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1465,8 +1466,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1834,7 +1835,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 #, fuzzy
 msgid "List instance devices"
 msgstr "Копирование образа: %s"
@@ -2003,6 +2004,11 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+#, fuzzy
+msgid "Manage devices"
+msgstr "Копирование образа: %s"
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -2038,11 +2044,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-#, fuzzy
-msgid "Manage instance devices"
-msgstr "Копирование образа: %s"
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 #, fuzzy
 msgid "Manage instance file templates"
@@ -2146,9 +2147,9 @@ msgstr "Копирование образа: %s"
 msgid "Missing instance name"
 msgstr "Имя контейнера: %s"
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2361,7 +2362,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2708,7 +2709,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 #, fuzzy
 msgid "Remove instance devices"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -2886,22 +2887,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -3023,8 +3024,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3247,7 +3248,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3268,12 +3269,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3301,7 +3302,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3457,8 +3458,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3590,6 +3591,14 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+#, fuzzy
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/profile.go:99
 #, fuzzy
 msgid "add [<remote>:]<instance> <profile>"
@@ -3598,9 +3607,9 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:74
+#: lxc/config_device.go:83
 #, fuzzy
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -3936,9 +3945,9 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
+#: lxc/config_device.go:188
 #, fuzzy
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -3960,6 +3969,14 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
+#: lxc/config_device.go:190
+#, fuzzy
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -4051,7 +4068,7 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 #, fuzzy
 msgid "list [<remote>:]<instance>"
 msgstr ""
@@ -4059,18 +4076,18 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:258
+#: lxc/storage_volume.go:1078
+msgid "list [<remote>:]<pool>"
+msgstr ""
+
+#: lxc/config_device.go:270
 #, fuzzy
-msgid "list [<remote>:]<instance|profile>"
+msgid "list [<remote>:]<profile>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/storage_volume.go:1078
-msgid "list [<remote>:]<pool>"
-msgstr ""
-
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -4241,7 +4258,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4353,7 +4370,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 #, fuzzy
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
@@ -4438,17 +4455,17 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
+#: lxc/config_device.go:423
 #, fuzzy
-msgid "remove [<remote>:]<instance> <profile>"
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:413
+#: lxc/profile.go:634
 #, fuzzy
-msgid "remove [<remote>:]<instance|profile> <name>..."
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4458,6 +4475,14 @@ msgstr ""
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+#, fuzzy
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4528,9 +4553,9 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:504
+#: lxc/config_device.go:519
 #, fuzzy
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4556,6 +4581,14 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
+#: lxc/config_device.go:526
+#, fuzzy
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/profile.go:760
 #, fuzzy
 msgid "set [<remote>:]<profile> <key><value>..."
@@ -4588,7 +4621,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 #, fuzzy
 msgid "show [<remote>:]<instance>"
 msgstr ""
@@ -4604,14 +4637,6 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/config_device.go:611
-#, fuzzy
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4636,7 +4661,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4733,9 +4758,9 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
+#: lxc/config_device.go:698
 #, fuzzy
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 "Изменение состояния одного или нескольких контейнеров %s.\n"
 "\n"
@@ -4753,6 +4778,14 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+#, fuzzy
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
@@ -4795,6 +4828,13 @@ msgstr ""
 msgid "yes"
 msgstr "да"
 
+#, fuzzy
+#~ msgid "show [<remote>:]<instance|profile>"
+#~ msgstr ""
+#~ "Изменение состояния одного или нескольких контейнеров %s.\n"
+#~ "\n"
+#~ "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
 #~ msgid "ARCH"
 #~ msgstr "ARCH"
 
diff --git a/po/sl.po b/po/sl.po
index d2f55874cf..1a8eb8ba4d 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 559834fa10..3d5536a049 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index d2fe811dcb..23f1174598 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index ce1025c0c8..8e8b2d1aba 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 065f4f49c6..370d2faf2f 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index 450dfaedf2..e1053afb8b 100644
--- a/po/ug.po
+++ b/po/ug.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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 54e988ba7a..e9562c9afe 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -875,11 +875,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -888,39 +888,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -940,17 +940,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1179,8 +1179,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1307,8 +1307,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1671,7 +1671,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1836,6 +1836,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1871,10 +1875,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1970,9 +1970,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2525,7 +2525,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2696,22 +2696,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2832,8 +2832,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3051,7 +3051,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3072,12 +3072,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3105,7 +3105,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3261,8 +3261,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3394,12 +3394,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3655,8 +3659,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3671,6 +3675,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3746,18 +3754,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3928,7 +3936,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4032,7 +4040,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4093,18 +4101,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4155,8 +4167,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4171,6 +4183,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4191,7 +4207,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4199,10 +4215,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4223,7 +4235,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4296,8 +4308,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4312,6 +4324,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index 84fc5fe011..04e9992d6a 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-09-03 21:17+0200\n"
+"POT-Creation-Date: 2020-09-09 14:18-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/"
@@ -242,7 +242,7 @@ msgstr ""
 msgid "--target cannot be used with instances"
 msgstr ""
 
-#: lxc/alias.go:126 lxc/image_alias.go:231 lxc/image.go:1009
+#: lxc/alias.go:126 lxc/image.go:1009 lxc/image_alias.go:231
 msgid "ALIAS"
 msgstr ""
 
@@ -270,8 +270,8 @@ msgstr ""
 msgid "Action (defaults to GET)"
 msgstr ""
 
-#: lxc/config_device.go:75 lxc/config_device.go:76
-msgid "Add devices to instances or profiles"
+#: lxc/config_device.go:74 lxc/config_device.go:75
+msgid "Add instance devices"
 msgstr ""
 
 #: lxc/alias.go:53 lxc/alias.go:54
@@ -667,7 +667,7 @@ msgstr ""
 msgid "Copy instances within or in between LXD servers"
 msgstr ""
 
-#: lxc/config_device.go:326 lxc/config_device.go:327
+#: lxc/config_device.go:335 lxc/config_device.go:336
 msgid "Copy profile inherited devices and override configuration keys"
 msgstr ""
 
@@ -805,7 +805,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image_alias.go:234 lxc/image.go:1014 lxc/list.go:429 lxc/network.go:883
+#: lxc/image.go:1014 lxc/image_alias.go:234 lxc/list.go:429 lxc/network.go:883
 #: lxc/operation.go:160 lxc/storage.go:559 lxc/storage_volume.go:1137
 msgid "DESCRIPTION"
 msgstr ""
@@ -878,11 +878,11 @@ msgstr ""
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
 #: lxc/alias.go:195 lxc/cluster.go:31 lxc/cluster.go:74 lxc/cluster.go:154
 #: lxc/cluster.go:204 lxc/cluster.go:254 lxc/cluster.go:337 lxc/cluster.go:422
-#: 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.go:30 lxc/config.go:89 lxc/config.go:360
-#: lxc/config.go:452 lxc/config.go:610 lxc/config.go:734
+#: lxc/config.go:30 lxc/config.go:89 lxc/config.go:360 lxc/config.go:452
+#: lxc/config.go:610 lxc/config.go:734 lxc/config_device.go:24
+#: lxc/config_device.go:75 lxc/config_device.go:193 lxc/config_device.go:265
+#: lxc/config_device.go:336 lxc/config_device.go:429 lxc/config_device.go:520
+#: lxc/config_device.go:527 lxc/config_device.go:631 lxc/config_device.go:703
 #: 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
@@ -891,39 +891,39 @@ msgstr ""
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:36
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:40 lxc/export.go:32
 #: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
-#: lxc/file.go:407 lxc/image_alias.go:25 lxc/image_alias.go:58
-#: lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252
-#: lxc/image.go:38 lxc/image.go:129 lxc/image.go:277 lxc/image.go:328
-#: lxc/image.go:453 lxc/image.go:612 lxc/image.go:840 lxc/image.go:975
-#: lxc/image.go:1273 lxc/image.go:1352 lxc/import.go:28 lxc/info.go:33
-#: lxc/init.go:40 lxc/launch.go:25 lxc/list.go:45 lxc/main.go:50
-#: lxc/manpage.go:20 lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33
-#: lxc/network.go:109 lxc/network.go:182 lxc/network.go:255 lxc/network.go:329
-#: lxc/network.go:379 lxc/network.go:464 lxc/network.go:549 lxc/network.go:672
-#: lxc/network.go:730 lxc/network.go:810 lxc/network.go:905 lxc/network.go:974
-#: lxc/network.go:1024 lxc/network.go:1094 lxc/network.go:1156
-#: 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:476 lxc/project.go:531 lxc/project.go:591
-#: lxc/project.go:620 lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32
-#: 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:27 lxc/storage.go:33
-#: lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333
-#: lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651
-#: lxc/storage.go:735 lxc/storage_volume.go:33 lxc/storage_volume.go:140
-#: lxc/storage_volume.go:223 lxc/storage_volume.go:310
-#: lxc/storage_volume.go:472 lxc/storage_volume.go:551
-#: lxc/storage_volume.go:627 lxc/storage_volume.go:709
-#: lxc/storage_volume.go:790 lxc/storage_volume.go:990
-#: lxc/storage_volume.go:1081 lxc/storage_volume.go:1161
-#: lxc/storage_volume.go:1192 lxc/storage_volume.go:1305
-#: lxc/storage_volume.go:1381 lxc/storage_volume.go:1480
-#: lxc/storage_volume.go:1513 lxc/storage_volume.go:1589 lxc/version.go:22
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:129 lxc/image.go:277
+#: lxc/image.go:328 lxc/image.go:453 lxc/image.go:612 lxc/image.go:840
+#: lxc/image.go:975 lxc/image.go:1273 lxc/image.go:1352 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:25 lxc/list.go:45 lxc/main.go:50 lxc/manpage.go:20
+#: lxc/monitor.go:30 lxc/move.go:36 lxc/network.go:33 lxc/network.go:109
+#: lxc/network.go:182 lxc/network.go:255 lxc/network.go:329 lxc/network.go:379
+#: lxc/network.go:464 lxc/network.go:549 lxc/network.go:672 lxc/network.go:730
+#: lxc/network.go:810 lxc/network.go:905 lxc/network.go:974 lxc/network.go:1024
+#: lxc/network.go:1094 lxc/network.go:1156 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:476 lxc/project.go:531 lxc/project.go:591 lxc/project.go:620
+#: lxc/project.go:673 lxc/publish.go:31 lxc/query.go:32 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:27 lxc/storage.go:33 lxc/storage.go:89
+#: lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388
+#: lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735
+#: lxc/storage_volume.go:33 lxc/storage_volume.go:140 lxc/storage_volume.go:223
+#: lxc/storage_volume.go:310 lxc/storage_volume.go:472
+#: lxc/storage_volume.go:551 lxc/storage_volume.go:627
+#: lxc/storage_volume.go:709 lxc/storage_volume.go:790
+#: lxc/storage_volume.go:990 lxc/storage_volume.go:1081
+#: lxc/storage_volume.go:1161 lxc/storage_volume.go:1192
+#: lxc/storage_volume.go:1305 lxc/storage_volume.go:1381
+#: lxc/storage_volume.go:1480 lxc/storage_volume.go:1513
+#: lxc/storage_volume.go:1589 lxc/version.go:22
 msgid "Description"
 msgstr ""
 
@@ -943,17 +943,17 @@ msgstr ""
 msgid "Detach storage volumes from profiles"
 msgstr ""
 
-#: lxc/config_device.go:170
+#: lxc/config_device.go:171
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config_device.go:397
+#: lxc/config_device.go:406
 #, c-format
 msgid "Device %s overridden for %s"
 msgstr ""
 
-#: lxc/config_device.go:488
+#: lxc/config_device.go:501
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
@@ -1182,8 +1182,8 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:172 lxc/image_alias.go:232 lxc/image.go:1011
-#: lxc/image.go:1012
+#: lxc/config_trust.go:172 lxc/image.go:1011 lxc/image.go:1012
+#: lxc/image_alias.go:232
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1268,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #: lxc/alias.go:102 lxc/cluster.go:76 lxc/config_template.go:238
-#: lxc/config_trust.go:117 lxc/image_alias.go:155 lxc/image.go:1001
+#: lxc/config_trust.go:117 lxc/image.go:1001 lxc/image_alias.go:155
 #: lxc/list.go:118 lxc/network.go:814 lxc/network.go:907 lxc/operation.go:104
 #: lxc/profile.go:581 lxc/project.go:386 lxc/remote.go:463 lxc/storage.go:510
 #: lxc/storage_volume.go:1083
@@ -1310,8 +1310,8 @@ msgstr ""
 msgid "Get runtime information on networks"
 msgstr ""
 
-#: lxc/config_device.go:187 lxc/config_device.go:188
-msgid "Get values for instance device configuration keys"
+#: lxc/config_device.go:192 lxc/config_device.go:193
+msgid "Get values for device configuration keys"
 msgstr ""
 
 #: lxc/config.go:359 lxc/config.go:360
@@ -1674,7 +1674,7 @@ msgid ""
 "    t - Type"
 msgstr ""
 
-#: lxc/config_device.go:260 lxc/config_device.go:261
+#: lxc/config_device.go:264 lxc/config_device.go:265
 msgid "List instance devices"
 msgstr ""
 
@@ -1839,6 +1839,10 @@ msgstr ""
 msgid "Manage command aliases"
 msgstr ""
 
+#: lxc/config_device.go:23 lxc/config_device.go:24
+msgid "Manage devices"
+msgstr ""
+
 #: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in instances"
 msgstr ""
@@ -1874,10 +1878,6 @@ msgstr ""
 msgid "Manage instance and server configuration options"
 msgstr ""
 
-#: lxc/config_device.go:23 lxc/config_device.go:24
-msgid "Manage instance devices"
-msgstr ""
-
 #: lxc/config_template.go:27 lxc/config_template.go:28
 msgid "Manage instance file templates"
 msgstr ""
@@ -1973,9 +1973,9 @@ msgstr ""
 msgid "Missing instance name"
 msgstr ""
 
-#: lxc/config_device.go:109 lxc/config_device.go:212 lxc/config_device.go:285
-#: lxc/config_device.go:351 lxc/config_device.go:440 lxc/config_device.go:541
-#: lxc/config_device.go:637
+#: lxc/config_device.go:110 lxc/config_device.go:217 lxc/config_device.go:294
+#: lxc/config_device.go:360 lxc/config_device.go:453 lxc/config_device.go:555
+#: lxc/config_device.go:655
 msgid "Missing name"
 msgstr ""
 
@@ -2182,7 +2182,7 @@ msgstr ""
 msgid "No storage pool for target volume specified"
 msgstr ""
 
-#: lxc/config_device.go:120 lxc/config_device.go:375
+#: lxc/config_device.go:121 lxc/config_device.go:384
 #, c-format
 msgid "No value found in %q"
 msgstr ""
@@ -2528,7 +2528,7 @@ msgstr ""
 msgid "Remove aliases"
 msgstr ""
 
-#: lxc/config_device.go:415 lxc/config_device.go:416
+#: lxc/config_device.go:428 lxc/config_device.go:429
 msgid "Remove instance devices"
 msgstr ""
 
@@ -2699,22 +2699,22 @@ msgstr ""
 msgid "Server version: %s\n"
 msgstr ""
 
-#: lxc/config_device.go:505
-msgid "Set instance device configuration keys"
+#: lxc/config_device.go:517
+msgid "Set device configuration keys"
 msgstr ""
 
-#: lxc/config_device.go:507
+#: lxc/config_device.go:520
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
 "    lxc config device set [<remote>:]<instance> <device> <key> <value>"
 msgstr ""
 
-#: lxc/config_device.go:513
+#: lxc/config_device.go:527
 msgid ""
-"Set instance device configuration keys\n"
+"Set device configuration keys\n"
 "\n"
 "For backward compatibility, a single configuration key may still be set "
 "with:\n"
@@ -2835,8 +2835,8 @@ msgstr ""
 msgid "Show details on a background operation"
 msgstr ""
 
-#: lxc/config_device.go:612 lxc/config_device.go:613
-msgid "Show full device configuration for instances or profiles"
+#: lxc/config_device.go:630 lxc/config_device.go:631
+msgid "Show full device configuration"
 msgstr ""
 
 #: lxc/image.go:1351 lxc/image.go:1352
@@ -3054,7 +3054,7 @@ msgstr ""
 msgid "TARGET"
 msgstr ""
 
-#: lxc/image_alias.go:233 lxc/image.go:1018 lxc/list.go:441 lxc/network.go:879
+#: lxc/image.go:1018 lxc/image_alias.go:233 lxc/list.go:441 lxc/network.go:879
 #: lxc/network.go:954 lxc/operation.go:159 lxc/storage_volume.go:1135
 msgid "TYPE"
 msgstr ""
@@ -3075,12 +3075,12 @@ msgstr ""
 msgid "The destination LXD server is not clustered"
 msgstr ""
 
-#: lxc/config_device.go:136 lxc/config_device.go:153 lxc/config_device.go:363
+#: lxc/config_device.go:137 lxc/config_device.go:154 lxc/config_device.go:372
 msgid "The device already exists"
 msgstr ""
 
-#: lxc/config_device.go:227 lxc/config_device.go:239 lxc/config_device.go:453
-#: lxc/config_device.go:471 lxc/config_device.go:560 lxc/config_device.go:579
+#: lxc/config_device.go:232 lxc/config_device.go:244 lxc/config_device.go:466
+#: lxc/config_device.go:484 lxc/config_device.go:574 lxc/config_device.go:593
 msgid "The device doesn't exist"
 msgstr ""
 
@@ -3108,7 +3108,7 @@ msgstr ""
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/config_device.go:368
+#: lxc/config_device.go:377
 msgid "The profile device doesn't exist"
 msgstr ""
 
@@ -3264,8 +3264,8 @@ msgstr ""
 msgid "Unset all profiles on the target instance"
 msgstr ""
 
-#: lxc/config_device.go:680 lxc/config_device.go:681
-msgid "Unset instance device configuration keys"
+#: lxc/config_device.go:702 lxc/config_device.go:703
+msgid "Unset device configuration keys"
 msgstr ""
 
 #: lxc/config.go:733 lxc/config.go:734
@@ -3397,12 +3397,16 @@ msgstr ""
 msgid "add [<remote>:] <cert>"
 msgstr ""
 
+#: lxc/config_device.go:78
+msgid "add [<remote>:]<instance> <device> <type> [key=value...]"
+msgstr ""
+
 #: lxc/profile.go:99
 msgid "add [<remote>:]<instance> <profile>"
 msgstr ""
 
-#: lxc/config_device.go:74
-msgid "add [<remote>:]<instance|profile> <device> <type> [key=value...]"
+#: lxc/config_device.go:83
+msgid "add [<remote>:]<profile> <device> <type> [key=value...]"
 msgstr ""
 
 #: lxc/remote.go:82
@@ -3658,8 +3662,8 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: lxc/config_device.go:186
-msgid "get [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:188
+msgid "get [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:670
@@ -3674,6 +3678,10 @@ msgstr ""
 msgid "get [<remote>:]<pool> <volume>[/<snapshot>] <key>"
 msgstr ""
 
+#: lxc/config_device.go:190
+msgid "get [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:526
 msgid "get [<remote>:]<profile> <key>"
 msgstr ""
@@ -3749,18 +3757,18 @@ msgstr ""
 msgid "list [<remote>:] [<filters>...]"
 msgstr ""
 
-#: lxc/config_template.go:234
+#: lxc/config_device.go:268 lxc/config_template.go:234
 msgid "list [<remote>:]<instance>"
 msgstr ""
 
-#: lxc/config_device.go:258
-msgid "list [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/storage_volume.go:1078
 msgid "list [<remote>:]<pool>"
 msgstr ""
 
+#: lxc/config_device.go:270
+msgid "list [<remote>:]<profile>"
+msgstr ""
+
 #: lxc/network.go:903
 msgid "list-leases [<remote>:]<network>"
 msgstr ""
@@ -3931,7 +3939,7 @@ msgid ""
 "    Remove all profile from \"foo\""
 msgstr ""
 
-#: lxc/config_device.go:83
+#: lxc/config_device.go:84
 msgid ""
 "lxc profile device add [<remote>:]profile1 <device-name> disk source=/share/"
 "c1 path=opt\n"
@@ -4035,7 +4043,7 @@ msgstr ""
 msgid "operation"
 msgstr ""
 
-#: lxc/config_device.go:325
+#: lxc/config_device.go:334
 msgid "override [<remote>:]<instance> <device> [key=value...]"
 msgstr ""
 
@@ -4096,18 +4104,22 @@ msgstr ""
 msgid "remove [<remote>:] <hostname|fingerprint>"
 msgstr ""
 
-#: lxc/profile.go:634
-msgid "remove [<remote>:]<instance> <profile>"
+#: lxc/config_device.go:423
+msgid "remove [<remote>:]<instance> <name>..."
 msgstr ""
 
-#: lxc/config_device.go:413
-msgid "remove [<remote>:]<instance|profile> <name>..."
+#: lxc/profile.go:634
+msgid "remove [<remote>:]<instance> <profile>"
 msgstr ""
 
 #: lxc/cluster.go:251
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
+#: lxc/config_device.go:425
+msgid "remove [<remote>:]<profile> <name>..."
+msgstr ""
+
 #: lxc/alias.go:141
 msgid "rename <old alias> <new alias>"
 msgstr ""
@@ -4158,8 +4170,8 @@ msgstr ""
 msgid "restore [<remote>:]<pool> <volume> <snapshot>"
 msgstr ""
 
-#: lxc/config_device.go:504
-msgid "set [<remote>:]<instance|profile> <device> <key>=<value>..."
+#: lxc/config_device.go:519
+msgid "set [<remote>:]<instance> <device> <key>=<value>..."
 msgstr ""
 
 #: lxc/network.go:1022
@@ -4174,6 +4186,10 @@ msgstr ""
 msgid "set [<remote>:]<pool> <volume> <key>=<value>..."
 msgstr ""
 
+#: lxc/config_device.go:526
+msgid "set [<remote>:]<profile> <device> <key>=<value>..."
+msgstr ""
+
 #: lxc/profile.go:760
 msgid "set [<remote>:]<profile> <key><value>..."
 msgstr ""
@@ -4194,7 +4210,7 @@ msgstr ""
 msgid "show [<remote>:]<image>"
 msgstr ""
 
-#: lxc/config_metadata.go:172
+#: lxc/config_device.go:626 lxc/config_metadata.go:172
 msgid "show [<remote>:]<instance>"
 msgstr ""
 
@@ -4202,10 +4218,6 @@ msgstr ""
 msgid "show [<remote>:]<instance> <template>"
 msgstr ""
 
-#: lxc/config_device.go:611
-msgid "show [<remote>:]<instance|profile>"
-msgstr ""
-
 #: lxc/cluster.go:152
 msgid "show [<remote>:]<member>"
 msgstr ""
@@ -4226,7 +4238,7 @@ msgstr ""
 msgid "show [<remote>:]<pool> <volume>[/<snapshot>]"
 msgstr ""
 
-#: lxc/profile.go:819
+#: lxc/config_device.go:628 lxc/profile.go:819
 msgid "show [<remote>:]<profile>"
 msgstr ""
 
@@ -4299,8 +4311,8 @@ msgstr ""
 msgid "unreachable"
 msgstr ""
 
-#: lxc/config_device.go:679
-msgid "unset [<remote>:]<instance|profile> <device> <key>"
+#: lxc/config_device.go:698
+msgid "unset [<remote>:]<instance> <device> <key>"
 msgstr ""
 
 #: lxc/network.go:1154
@@ -4315,6 +4327,10 @@ msgstr ""
 msgid "unset [<remote>:]<pool> <volume> <key>"
 msgstr ""
 
+#: lxc/config_device.go:700
+msgid "unset [<remote>:]<profile> <device> <key>"
+msgstr ""
+
 #: lxc/profile.go:873
 msgid "unset [<remote>:]<profile> <key>"
 msgstr ""


More information about the lxc-devel mailing list