[lxc-devel] [lxd/master] Fix config overrides and improve MAAS errors

stgraber on Github lxc-bot at linuxcontainers.org
Thu Jun 7 20:39:16 UTC 2018 

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/20180607/92b713cd/attachment.bin>
-------------- next part --------------
From e802e03d6e7eb93b3560198e5554bf5b12a6f62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 7 Jun 2018 15:28:19 -0400
Subject: [PATCH 1/3] lxc/move: Support config and profile overrides
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4627

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

diff --git a/lxc/move.go b/lxc/move.go
index 6f885a9c2..6db73a6d6 100644
--- a/lxc/move.go
+++ b/lxc/move.go
@@ -17,6 +17,9 @@ import (
 type cmdMove struct {
 	global *cmdGlobal
 
+	flagNoProfiles    bool
+	flagProfile       []string
+	flagConfig        []string
 	flagContainerOnly bool
 	flagMode          string
 	flagStateless     bool
@@ -42,6 +45,9 @@ lxc move <container>/<old snapshot name> <container>/<new snapshot name>
     Rename a snapshot.`))
 
 	cmd.RunE = c.Run
+	cmd.Flags().StringArrayVarP(&c.flagConfig, "config", "c", nil, i18n.G("Config key/value to apply to the target container")+"``")
+	cmd.Flags().StringArrayVarP(&c.flagProfile, "profile", "p", nil, i18n.G("Profile to apply to the target container")+"``")
+	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Unset all profiles on the target container"))
 	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false, i18n.G("Move the container without its snapshots"))
 	cmd.Flags().StringVar(&c.flagMode, "mode", "pull", i18n.G("Transfer mode. One of pull (default), push or relay.")+"``")
 	cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Copy a stateful container stateless"))
@@ -99,6 +105,10 @@ func (c *cmdMove) Run(cmd *cobra.Command, args []string) error {
 	// course, this changing of hostname isn't supported right now, so this
 	// simply won't work).
 	if sourceRemote == destRemote && c.flagTarget == "" && c.flagStorage == "" {
+		if c.flagConfig != nil || c.flagProfile != nil || c.flagNoProfiles {
+			return fmt.Errorf(i18n.G("Can't override configuration or profiles in local rename"))
+		}
+
 		source, err := conf.GetContainerServer(sourceRemote)
 		if err != nil {
 			return err
@@ -148,6 +158,9 @@ func (c *cmdMove) Run(cmd *cobra.Command, args []string) error {
 
 	cpy := cmdCopy{}
 	cpy.flagTarget = c.flagTarget
+	cpy.flagConfig = c.flagConfig
+	cpy.flagProfile = c.flagProfile
+	cpy.flagNoProfiles = c.flagNoProfiles
 
 	stateful := !c.flagStateless
 

From ae9be8e1761431958ec4fb47ab0e8c6ffaab9feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 7 Jun 2018 15:28:31 -0400
Subject: [PATCH 2/3] i18n: Update translation templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 po/de.po      | 46 +++++++++++++++++++++++++++++++---------------
 po/el.po      | 40 ++++++++++++++++++++++++++++------------
 po/es.po      | 40 ++++++++++++++++++++++++++++------------
 po/fa.po      | 40 ++++++++++++++++++++++++++++------------
 po/fi.po      | 40 ++++++++++++++++++++++++++++------------
 po/fr.po      | 46 +++++++++++++++++++++++++++++++---------------
 po/hi.po      | 40 ++++++++++++++++++++++++++++------------
 po/id.po      | 40 ++++++++++++++++++++++++++++------------
 po/it.po      | 44 +++++++++++++++++++++++++++++---------------
 po/ja.po      | 43 +++++++++++++++++++++++++++++++------------
 po/ko.po      | 40 ++++++++++++++++++++++++++++------------
 po/lxd.pot    | 40 ++++++++++++++++++++++++++++------------
 po/nb_NO.po   | 40 ++++++++++++++++++++++++++++------------
 po/nl.po      | 40 ++++++++++++++++++++++++++++------------
 po/pa.po      | 40 ++++++++++++++++++++++++++++------------
 po/pl.po      | 40 ++++++++++++++++++++++++++++------------
 po/pt_BR.po   | 40 ++++++++++++++++++++++++++++------------
 po/ru.po      | 40 ++++++++++++++++++++++++++++------------
 po/sr.po      | 40 ++++++++++++++++++++++++++++------------
 po/sv.po      | 40 ++++++++++++++++++++++++++++------------
 po/tr.po      | 40 ++++++++++++++++++++++++++++------------
 po/uk.po      | 40 ++++++++++++++++++++++++++++------------
 po/zh.po      | 40 ++++++++++++++++++++++++++++------------
 po/zh_Hans.po | 40 ++++++++++++++++++++++++++++------------
 24 files changed, 682 insertions(+), 297 deletions(-)

diff --git a/po/de.po b/po/de.po
index dbdb9b617..626148a42 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: 2018-05-23 00:30+0000\n"
 "Last-Translator: Christian Brauner <christian.brauner at ubuntu.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -467,6 +467,10 @@ msgstr ""
 "Optionen:\n"
 "\n"
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -520,7 +524,7 @@ msgstr "Gespeichertes Nutzerzertifikat auf dem Server: "
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -556,6 +560,11 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
+#: lxc/move.go:48
+#, fuzzy
+msgid "Config key/value to apply to the target container"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -581,7 +590,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -794,7 +803,7 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1721,7 +1730,7 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 "Mehr als eine Datei herunterzuladen, aber das Ziel ist kein Verzeichnis"
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 #, fuzzy
 msgid "Move containers within or in between LXD instances"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -1731,7 +1740,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Move storage volumes between pools"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 #, fuzzy
 msgid "Move the container without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -1962,6 +1971,11 @@ msgstr "Profil %s wurde auf %s angewandt\n"
 msgid "Profile to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
+#: lxc/move.go:49
+#, fuzzy
+msgid "Profile to apply to the target container"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
 #: lxc/profile.go:225
 #, fuzzy, c-format
 msgid "Profiles %s applied to %s"
@@ -2435,7 +2449,7 @@ msgstr "Profil %s gelöscht\n"
 msgid "Storage pool %s pending on member %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 #, fuzzy
 msgid "Storage pool name"
 msgstr "Profilname kann nicht geändert werden"
@@ -2571,7 +2585,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2626,6 +2640,11 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr "Unbekannter Befehl %s für Abbild"
 
+#: lxc/move.go:50
+#, fuzzy
+msgid "Unset all profiles on the target container"
+msgstr "nicht alle Profile der Quelle sind am Ziel vorhanden."
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2710,12 +2729,12 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "You must specify a destination container name when using --target"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 #, fuzzy
 msgid "You must specify a source container name"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -3204,7 +3223,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 #, fuzzy
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
@@ -3306,7 +3325,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 #, fuzzy
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
@@ -4128,9 +4147,6 @@ msgstr ""
 #~ msgid "got bad version"
 #~ msgstr "Versionskonflikt"
 
-#~ msgid "not all the profiles from the source exist on the target"
-#~ msgstr "nicht alle Profile der Quelle sind am Ziel vorhanden."
-
 #, fuzzy
 #~ msgid ""
 #~ "Check if the LXD instance is up.\n"
diff --git a/po/el.po b/po/el.po
index 0fb6a8aa7..8eb0d17bd 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-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/"
@@ -354,6 +354,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -407,7 +411,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -442,6 +446,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -467,7 +475,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -666,7 +674,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1540,7 +1548,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1548,7 +1556,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1773,6 +1781,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2221,7 +2233,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2346,7 +2358,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2401,6 +2413,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2479,11 +2495,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2954,7 +2970,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3052,7 +3068,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/es.po b/po/es.po
index b40ca6c4c..65dc99dc3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: 2018-02-10 11:39+0000\n"
 "Last-Translator: Allan Esquivel Sibaja <allan.esquivel.sibaja at gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -411,6 +411,10 @@ msgstr "CREADO EN"
 msgid "Cached: %s"
 msgstr "Cacheado: %s"
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -464,7 +468,7 @@ msgstr "Certificado del cliente almacenado en el servidor:"
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -499,6 +503,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -524,7 +532,7 @@ msgstr "Nombre del contenedor es: %s"
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -724,7 +732,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1602,7 +1610,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1610,7 +1618,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1834,6 +1842,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2282,7 +2294,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2407,7 +2419,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2462,6 +2474,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2540,11 +2556,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -3016,7 +3032,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3114,7 +3130,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/fa.po b/po/fa.po
index a41b3f01f..527f077e9 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/fi.po b/po/fi.po
index 1c034c8ad..1ef4ed37e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/fr.po b/po/fr.po
index 2de446c43..80348b820 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: 2018-03-06 13:50+0000\n"
 "Last-Translator: Alban Vidal <alban.vidal at zordhak.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -456,6 +456,10 @@ msgstr "CRÉÉ À"
 msgid "Cached: %s"
 msgstr "Créé : %s"
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -513,7 +517,7 @@ msgstr "Certificat client enregistré sur le serveur : "
 msgid "Client version: %s\n"
 msgstr "Afficher la version du client"
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -554,6 +558,11 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
+#: lxc/move.go:48
+#, fuzzy
+msgid "Config key/value to apply to the target container"
+msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -579,7 +588,7 @@ msgstr "Le nom du conteneur est : %s"
 msgid "Container published with fingerprint: %s"
 msgstr "Conteneur publié avec l'empreinte : %s"
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -807,7 +816,7 @@ msgstr "Copie de l'image : %s"
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1793,7 +1802,7 @@ msgid "More than one file to download, but target is not a directory"
 msgstr ""
 "Plusieurs fichiers à télécharger, mais la destination n'est pas un dossier"
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 #, fuzzy
 msgid "Move containers within or in between LXD instances"
 msgstr "Forcer le conteneur à s'arrêter"
@@ -1803,7 +1812,7 @@ msgstr "Forcer le conteneur à s'arrêter"
 msgid "Move storage volumes between pools"
 msgstr "Copie de l'image : %s"
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 #, fuzzy
 msgid "Move the container without its snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
@@ -2033,6 +2042,11 @@ msgstr "Profil %s ajouté à %s"
 msgid "Profile to apply to the new container"
 msgstr "Profil à appliquer au nouveau conteneur"
 
+#: lxc/move.go:49
+#, fuzzy
+msgid "Profile to apply to the target container"
+msgstr "Profil à appliquer au nouveau conteneur"
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2519,7 +2533,7 @@ msgstr "Le réseau %s a été supprimé"
 msgid "Storage pool %s pending on member %s"
 msgstr "Le réseau %s a été créé"
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr "Nom de l'ensemble de stockage"
 
@@ -2654,7 +2668,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2709,6 +2723,11 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+#, fuzzy
+msgid "Unset all profiles on the target container"
+msgstr "tous les profils de la source n'existent pas sur la cible"
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 #, fuzzy
 msgid "Unset container device configuration keys"
@@ -2799,12 +2818,12 @@ msgstr "impossible de copier vers le même nom de conteneur"
 msgid "You must specify a destination container name when using --target"
 msgstr "vous devez spécifier un nom de conteneur source"
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 #, fuzzy
 msgid "You must specify a source container name"
 msgstr "vous devez spécifier un nom de conteneur source"
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -3307,7 +3326,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 #, fuzzy
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
@@ -3417,7 +3436,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 #, fuzzy
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
@@ -4772,9 +4791,6 @@ msgstr "oui"
 #~ msgid "got bad version"
 #~ msgstr "reçu une mauvaise version"
 
-#~ msgid "not all the profiles from the source exist on the target"
-#~ msgstr "tous les profils de la source n'existent pas sur la cible"
-
 #~ msgid "unreachable return reached"
 #~ msgstr "Un retour impossible à été renvoyé"
 
diff --git a/po/hi.po b/po/hi.po
index bff93acfb..fedea8316 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/id.po b/po/id.po
index 58d45ba60..ff000af38 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/it.po b/po/it.po
index 8d70cea13..2d854cc9f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: 2017-08-18 14:22+0000\n"
 "Last-Translator: Alberto Donato <alberto.donato at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -377,6 +377,10 @@ msgstr "CREATO IL"
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -430,7 +434,7 @@ msgstr "Certificato del client salvato dal server: "
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -465,6 +469,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -490,7 +498,7 @@ msgstr "Il nome del container è: %s"
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -691,7 +699,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1574,7 +1582,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1582,7 +1590,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1807,6 +1815,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2257,7 +2269,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2384,7 +2396,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2439,6 +2451,11 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+#, fuzzy
+msgid "Unset all profiles on the target container"
+msgstr "non tutti i profili dell'origine esistono nella destinazione"
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2518,11 +2535,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr "Occorre specificare un nome di container come origine"
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr "Occorre specificare un nome di container come origine"
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2994,7 +3011,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3092,7 +3109,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
@@ -3402,6 +3419,3 @@ msgstr "si"
 
 #~ msgid "'/' not allowed in snapshot name"
 #~ msgstr "'/' non è permesso nel nome di uno snapshot"
-
-#~ msgid "not all the profiles from the source exist on the target"
-#~ msgstr "non tutti i profili dell'origine esistono nella destinazione"
diff --git a/po/ja.po b/po/ja.po
index 565614af9..3f9a4f9f3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: 2018-05-16 23:39+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -358,6 +358,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr "キャッシュ済: %s"
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr "ターゲットイメージの名前を取得できません"
@@ -414,7 +418,7 @@ msgstr "クライアント証明書がサーバに格納されました: "
 msgid "Client version: %s\n"
 msgstr "クライアントバージョン: %s\n"
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -453,6 +457,11 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr "新しいコンテナに適用するキー/値の設定"
 
+#: lxc/move.go:48
+#, fuzzy
+msgid "Config key/value to apply to the target container"
+msgstr "新しいコンテナに適用するキー/値の設定"
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -478,7 +487,7 @@ msgstr "コンテナ名: %s"
 msgid "Container published with fingerprint: %s"
 msgstr "コンテナは以下のフィンガープリントで publish されます: %s"
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr "ステートフルなコンテナをステートレスにコピーします"
 
@@ -685,7 +694,7 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1681,7 +1690,7 @@ msgstr ""
 "ダウンロード対象のファイルが複数ありますが、コピー先がディレクトリではありま"
 "せん"
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr "LXD サーバ内もしくはサーバ間でコンテナを移動します"
 
@@ -1689,7 +1698,7 @@ msgstr "LXD サーバ内もしくはサーバ間でコンテナを移動しま
 msgid "Move storage volumes between pools"
 msgstr "プール間でストレージボリュームを移動します"
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr "コンテナを移動します (スナップショットは移動しません)"
 
@@ -1913,6 +1922,11 @@ msgstr "プロファイル名 %s を %s に変更しました"
 msgid "Profile to apply to the new container"
 msgstr "新しいコンテナに適用するプロファイル"
 
+#: lxc/move.go:49
+#, fuzzy
+msgid "Profile to apply to the target container"
+msgstr "新しいコンテナに適用するプロファイル"
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2367,7 +2381,7 @@ msgstr "ストレージプール %s を削除しました"
 msgid "Storage pool %s pending on member %s"
 msgstr "ストレージプール %s はメンバ %s 上でペンディング状態です"
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr "ストレージプール名"
 
@@ -2503,7 +2517,7 @@ msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpu
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpull)"
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpull)。"
 
@@ -2558,6 +2572,11 @@ msgstr "未知のカラム名の短縮形です '%c' ('%s' 中)"
 msgid "Unknown file type '%s'"
 msgstr "未知のファイルタイプ '%s'"
 
+#: lxc/move.go:50
+#, fuzzy
+msgid "Unset all profiles on the target container"
+msgstr "コンテナにプロファイルを割り当てます"
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr "コンテナデバイスの設定を削除します"
@@ -2639,11 +2658,11 @@ msgstr "--mode と同時に -t または -T は指定できません"
 msgid "You must specify a destination container name when using --target"
 msgstr "--target オプションを使うときはコピー先のコンテナ名を指定してください"
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr "コピー元のコンテナ名を指定してください"
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 "--target を指定した場合は、ソースとデスティネーションのリモートは同じでなけれ"
@@ -3179,7 +3198,7 @@ msgstr ""
 "lxc monitor --type=lifecycle\n"
 "    lifecycle イベントのみを表示します。"
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3320,7 +3339,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/ko.po b/po/ko.po
index 8c0b96bd7..e4a220635 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: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/lxd.pot b/po/lxd.pot
index 77c061d8b..4819a0fe5 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2018-05-30 14:16+0200\n"
+        "POT-Creation-Date: 2018-06-07 15:27-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"
@@ -341,6 +341,10 @@ msgstr  ""
 msgid   "Cached: %s"
 msgstr  ""
 
+#: lxc/move.go:109
+msgid   "Can't override configuration or profiles in local rename"
+msgstr  ""
+
 #: lxc/image.go:175
 msgid   "Can't provide a name for the target image"
 msgstr  ""
@@ -393,7 +397,7 @@ msgstr  ""
 msgid   "Client version: %s\n"
 msgstr  ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415 lxc/storage_volume.go:490 lxc/storage_volume.go:716 lxc/storage_volume.go:842 lxc/storage_volume.go:984 lxc/storage_volume.go:1014 lxc/storage_volume.go:1078 lxc/storage_volume.go:1161 lxc/storage_volume.go:1230
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415 lxc/storage_volume.go:490 lxc/storage_volume.go:716 lxc/storage_volume.go:842 lxc/storage_volume.go:984 lxc/storage_volume.go:1014 lxc/storage_volume.go:1078 lxc/storage_volume.go:1161 lxc/storage_volume.go:1230
 msgid   "Cluster member name"
 msgstr  ""
 
@@ -420,6 +424,10 @@ msgstr  ""
 msgid   "Config key/value to apply to the new container"
 msgstr  ""
 
+#: lxc/move.go:48
+msgid   "Config key/value to apply to the target container"
+msgstr  ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144 lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298 lxc/storage_volume.go:808
 #, c-format
 msgid   "Config parsing error: %s"
@@ -443,7 +451,7 @@ msgstr  ""
 msgid   "Container published with fingerprint: %s"
 msgstr  ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid   "Copy a stateful container stateless"
 msgstr  ""
 
@@ -617,7 +625,7 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147 lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147 lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29 lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54 lxc/config_metadata.go:176 lxc/config_template.go:30 lxc/config_template.go:67 lxc/config_template.go:110 lxc/config_template.go:152 lxc/config_template.go:236 lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59 lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32 lxc/copy.go:36 lxc/delete.go:30 lxc/exec.go:39 lxc/export.go:29 lxc/file.go:40 lxc/file.go:73 lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42 lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211 lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104 lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367 lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719 lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989 lxc/network.go:1051 lxc/operation.go:25 lxc/operation.go:54 lxc/operation.go:98 lxc/operation.go:174 lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241 lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520 lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753 lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30 lxc/remote.go:37 lxc/remote.go:87 lxc/remote.go:383 lxc/remote.go:419 lxc/remote.go:524 lxc/remote.go:586 lxc/remote.go:635 lxc/remote.go:673 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:161 lxc/storage.go:208 lxc/storage.go:328 lxc/storage.go:383 lxc/storage.go:491 lxc/storage.go:573 lxc/storage.go:645 lxc/storage.go:729 lxc/storage_volume.go:34 lxc/storage_volume.go:122 lxc/storage_volume.go:201 lxc/storage_volume.go:283 lxc/storage_volume.go:412 lxc/storage_volume.go:487 lxc/storage_volume.go:547 lxc/storage_volume.go:629 lxc/storage_volume.go:710 lxc/storage_volume.go:839 lxc/storage_volume.go:904 lxc/storage_volume.go:980 lxc/storage_volume.go:1011 lxc/storage_volume.go:1075 lxc/storage_volume.go:1152 lxc/storage_volume.go:1227 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147 lxc/alias.go:198 lxc/cluster.go:27 lxc/cluster.go:64 lxc/cluster.go:147 lxc/cluster.go:197 lxc/cluster.go:243 lxc/cluster.go:290 lxc/config.go:29 lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54 lxc/config_metadata.go:176 lxc/config_template.go:30 lxc/config_template.go:67 lxc/config_template.go:110 lxc/config_template.go:152 lxc/config_template.go:236 lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59 lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32 lxc/copy.go:36 lxc/delete.go:30 lxc/exec.go:39 lxc/export.go:29 lxc/file.go:40 lxc/file.go:73 lxc/file.go:122 lxc/file.go:185 lxc/file.go:352 lxc/image.go:42 lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211 lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104 lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367 lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719 lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989 lxc/network.go:1051 lxc/operation.go:25 lxc/operation.go:54 lxc/operation.go:98 lxc/operation.go:174 lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241 lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520 lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753 lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:30 lxc/remote.go:37 lxc/remote.go:87 lxc/remote.go:383 lxc/remote.go:419 lxc/remote.go:524 lxc/remote.go:586 lxc/remote.go:635 lxc/remote.go:673 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:161 lxc/storage.go:208 lxc/storage.go:328 lxc/storage.go:383 lxc/storage.go:491 lxc/storage.go:573 lxc/storage.go:645 lxc/storage.go:729 lxc/storage_volume.go:34 lxc/storage_volume.go:122 lxc/storage_volume.go:201 lxc/storage_volume.go:283 lxc/storage_volume.go:412 lxc/storage_volume.go:487 lxc/storage_volume.go:547 lxc/storage_volume.go:629 lxc/storage_volume.go:710 lxc/storage_volume.go:839 lxc/storage_volume.go:904 lxc/storage_volume.go:980 lxc/storage_volume.go:1011 lxc/storage_volume.go:1075 lxc/storage_volume.go:1152 lxc/storage_volume.go:1227 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -1430,7 +1438,7 @@ msgstr  ""
 msgid   "More than one file to download, but target is not a directory"
 msgstr  ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid   "Move containers within or in between LXD instances"
 msgstr  ""
 
@@ -1438,7 +1446,7 @@ msgstr  ""
 msgid   "Move storage volumes between pools"
 msgstr  ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid   "Move the container without its snapshots"
 msgstr  ""
 
@@ -1659,6 +1667,10 @@ msgstr  ""
 msgid   "Profile to apply to the new container"
 msgstr  ""
 
+#: lxc/move.go:49
+msgid   "Profile to apply to the target container"
+msgstr  ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid   "Profiles %s applied to %s"
@@ -2104,7 +2116,7 @@ msgstr  ""
 msgid   "Storage pool %s pending on member %s"
 msgstr  ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid   "Storage pool name"
 msgstr  ""
 
@@ -2224,7 +2236,7 @@ msgstr  ""
 msgid   "Transfer mode. One of pull (default), push or relay"
 msgstr  ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid   "Transfer mode. One of pull (default), push or relay."
 msgstr  ""
 
@@ -2278,6 +2290,10 @@ msgstr  ""
 msgid   "Unknown file type '%s'"
 msgstr  ""
 
+#: lxc/move.go:50
+msgid   "Unset all profiles on the target container"
+msgstr  ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid   "Unset container device configuration keys"
 msgstr  ""
@@ -2351,11 +2367,11 @@ msgstr  ""
 msgid   "You must specify a destination container name when using --target"
 msgstr  ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid   "You must specify a source container name"
 msgstr  ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid   "You must use the same source and destination remote when using --target"
 msgstr  ""
 
@@ -2796,7 +2812,7 @@ msgid   "lxc monitor --type=logging\n"
         "    Only show lifecycle events."
 msgstr  ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid   "lxc move [<remote>:]<source container> [<remote>:][<destination container>] [--container-only]\n"
         "    Move a container between two hosts, renaming it if destination name differs.\n"
         "\n"
@@ -2880,7 +2896,7 @@ msgstr  ""
 msgid   "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr  ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid   "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/<snapshot>]]"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 67a0ba460..7037a3245 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/nl.po b/po/nl.po
index 79ce2de92..b77c30a65 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/pa.po b/po/pa.po
index 9cf68170c..d077b61af 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/pl.po b/po/pl.po
index e27470ce4..074981f11 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1206e8ef6..f9b03c324 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: 2018-03-08 09:21+0000\n"
 "Last-Translator: Paulo Coghi <paulo at coghi.com.br>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -367,6 +367,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -420,7 +424,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -455,6 +459,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -480,7 +488,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -679,7 +687,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1551,7 +1559,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1559,7 +1567,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1783,6 +1791,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2231,7 +2243,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2356,7 +2368,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2411,6 +2423,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2489,11 +2505,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2964,7 +2980,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3062,7 +3078,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/ru.po b/po/ru.po
index 5dfdc2353..f9e1f6494 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: 2017-09-05 16:48+0000\n"
 "Last-Translator: Ilya Yakimavets <ilya.yakimavets at backend.expert>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -440,6 +440,10 @@ msgstr "СОЗДАН"
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -493,7 +497,7 @@ msgstr "Сертификат клиента хранится на сервере
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -528,6 +532,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -553,7 +561,7 @@ msgstr "Имя контейнера: %s"
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -761,7 +769,7 @@ msgstr "Копирование образа: %s"
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1650,7 +1658,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1659,7 +1667,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr "Копирование образа: %s"
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1884,6 +1892,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2465,7 +2477,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2520,6 +2532,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2598,11 +2614,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -3090,7 +3106,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3188,7 +3204,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 #, fuzzy
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
diff --git a/po/sr.po b/po/sr.po
index 98f8cacbc..0e58c1caa 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/sv.po b/po/sv.po
index 2b6754620..d4124a543 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/tr.po b/po/tr.po
index 0533e3142..b2b8a4636 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/uk.po b/po/uk.po
index 64584d0b5..65b6be31d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/zh.po b/po/zh.po
index 2aec8a0ae..0ca12f604 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index b08d2e939..d0c882f12 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-05-30 14:16+0200\n"
+"POT-Creation-Date: 2018-06-07 15:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Cached: %s"
 msgstr ""
 
+#: lxc/move.go:109
+msgid "Can't override configuration or profiles in local rename"
+msgstr ""
+
 #: lxc/image.go:175
 msgid "Can't provide a name for the target image"
 msgstr ""
@@ -403,7 +407,7 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:49 lxc/network.go:253
+#: lxc/copy.go:47 lxc/init.go:48 lxc/move.go:55 lxc/network.go:253
 #: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
 #: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
 #: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:415
@@ -438,6 +442,10 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:48
+msgid "Config key/value to apply to the target container"
+msgstr ""
+
 #: lxc/config.go:195 lxc/config.go:259 lxc/config_metadata.go:144
 #: lxc/image.go:405 lxc/network.go:631 lxc/profile.go:490 lxc/storage.go:298
 #: lxc/storage_volume.go:808
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/copy.go:45 lxc/move.go:47
+#: lxc/copy.go:45 lxc/move.go:53
 msgid "Copy a stateful container stateless"
 msgstr ""
 
@@ -662,7 +670,7 @@ msgstr ""
 #: lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149
 #: lxc/image_alias.go:250 lxc/import.go:21 lxc/info.go:29 lxc/init.go:35
 #: lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19
-#: lxc/monitor.go:31 lxc/move.go:32 lxc/network.go:32 lxc/network.go:104
+#: lxc/monitor.go:31 lxc/move.go:35 lxc/network.go:32 lxc/network.go:104
 #: lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367
 #: lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719
 #: lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989
@@ -1534,7 +1542,7 @@ msgstr ""
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/move.go:31 lxc/move.go:32
+#: lxc/move.go:34 lxc/move.go:35
 msgid "Move containers within or in between LXD instances"
 msgstr ""
 
@@ -1542,7 +1550,7 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:45
+#: lxc/move.go:51
 msgid "Move the container without its snapshots"
 msgstr ""
 
@@ -1766,6 +1774,10 @@ msgstr ""
 msgid "Profile to apply to the new container"
 msgstr ""
 
+#: lxc/move.go:49
+msgid "Profile to apply to the target container"
+msgstr ""
+
 #: lxc/profile.go:225
 #, c-format
 msgid "Profiles %s applied to %s"
@@ -2214,7 +2226,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:48
+#: lxc/copy.go:46 lxc/init.go:46 lxc/move.go:54
 msgid "Storage pool name"
 msgstr ""
 
@@ -2339,7 +2351,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:46 lxc/storage_volume.go:286
+#: lxc/move.go:52 lxc/storage_volume.go:286
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -2394,6 +2406,10 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
+#: lxc/move.go:50
+msgid "Unset all profiles on the target container"
+msgstr ""
+
 #: lxc/config_device.go:649 lxc/config_device.go:650
 msgid "Unset container device configuration keys"
 msgstr ""
@@ -2472,11 +2488,11 @@ msgstr ""
 msgid "You must specify a destination container name when using --target"
 msgstr ""
 
-#: lxc/copy.go:75 lxc/move.go:190
+#: lxc/copy.go:75 lxc/move.go:203
 msgid "You must specify a source container name"
 msgstr ""
 
-#: lxc/copy.go:70 lxc/move.go:93 lxc/move.go:185
+#: lxc/copy.go:70 lxc/move.go:99 lxc/move.go:198
 msgid "You must use the same source and destination remote when using --target"
 msgstr ""
 
@@ -2947,7 +2963,7 @@ msgid ""
 "    Only show lifecycle events."
 msgstr ""
 
-#: lxc/move.go:34
+#: lxc/move.go:37
 msgid ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>] "
 "[--container-only]\n"
@@ -3045,7 +3061,7 @@ msgstr ""
 msgid "move [<pool>/]<volume> [<pool>/]<volume>"
 msgstr ""
 
-#: lxc/move.go:29
+#: lxc/move.go:32
 msgid ""
 "move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]]"

From 809c604270c078cb158fe8aa0d8adb237e4db1d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 7 Jun 2018 16:38:30 -0400
Subject: [PATCH 3/3] lxd/maas: Make error more readable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4627

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/maas/controller.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lxd/maas/controller.go b/lxd/maas/controller.go
index 59eb3dc3d..3e9661eff 100644
--- a/lxd/maas/controller.go
+++ b/lxd/maas/controller.go
@@ -3,6 +3,7 @@ package maas
 import (
 	"fmt"
 	"net/url"
+	"strings"
 
 	"github.com/juju/gomaasapi"
 )
@@ -67,7 +68,13 @@ func NewController(url string, key string, machine string) (*Controller, error)
 		APIKey:  key,
 	})
 	if err != nil {
-		return nil, err
+		// Juju errors aren't user-friendly, try to extract what actually happened
+		if !strings.Contains(err.Error(), "unsupported version") {
+			return nil, err
+		}
+
+		return nil, fmt.Errorf("Unable to connect MAAS at '%s': %v", baseURL,
+			strings.Split(strings.Split(err.Error(), "unsupported version: ")[1], " (")[0])
 	}
 
 	srvRaw, err := gomaasapi.NewAuthenticatedClient(baseURL, key)

More information about the lxc-devel mailing list