[lxc-devel] [lxd/master] Drop deprecated container-only

stgraber on Github lxc-bot at linuxcontainers.org
Wed Mar 25 17:26:43 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200325/919239ec/attachment-0001.bin>
-------------- next part --------------
From c3d47fde3ea295a6d7b4df8f0caa87dcf00d1e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 25 Mar 2020 13:23:24 -0400
Subject: [PATCH 1/3] lxc: Deprecate --container-only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/copy.go   | 1 -
 lxc/export.go | 2 --
 lxc/move.go   | 1 -
 3 files changed, 4 deletions(-)

diff --git a/lxc/copy.go b/lxc/copy.go
index 6f350c7f86..2ca221b166 100644
--- a/lxc/copy.go
+++ b/lxc/copy.go
@@ -48,7 +48,6 @@ func (c *cmdCopy) Command() *cobra.Command {
 	cmd.Flags().BoolVarP(&c.flagEphemeral, "ephemeral", "e", false, i18n.G("Ephemeral instance"))
 	cmd.Flags().StringVar(&c.flagMode, "mode", "pull", i18n.G("Transfer mode. One of pull (default), push or relay")+"``")
 	cmd.Flags().BoolVar(&c.flagInstanceOnly, "instance-only", false, i18n.G("Copy the instance without its snapshots"))
-	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false, i18n.G("Copy the instance without its snapshots (deprecated, use instance-only)"))
 	cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Copy a stateful instance stateless"))
 	cmd.Flags().StringVarP(&c.flagStorage, "storage", "s", "", i18n.G("Storage pool name")+"``")
 	cmd.Flags().StringVar(&c.flagTarget, "target", "", i18n.G("Cluster member name")+"``")
diff --git a/lxc/export.go b/lxc/export.go
index 7a00828b6b..d4bc6a6261 100644
--- a/lxc/export.go
+++ b/lxc/export.go
@@ -37,8 +37,6 @@ func (c *cmdExport) Command() *cobra.Command {
     Download a backup tarball of the u1 instance.`))
 
 	cmd.RunE = c.Run
-	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false,
-		i18n.G("Whether or not to only backup the container (without snapshots), (deprecated, use instance-only)"))
 	cmd.Flags().BoolVar(&c.flagInstanceOnly, "instance-only", false,
 		i18n.G("Whether or not to only backup the instance (without snapshots)"))
 	cmd.Flags().BoolVar(&c.flagOptimizedStorage, "optimized-storage", false,
diff --git a/lxc/move.go b/lxc/move.go
index 3a5e836353..bc578dfc31 100644
--- a/lxc/move.go
+++ b/lxc/move.go
@@ -51,7 +51,6 @@ lxc move <instance>/<old snapshot name> <instance>/<new snapshot name>
 	cmd.Flags().StringArrayVarP(&c.flagDevice, "device", "d", nil, i18n.G("New key/value to apply to a specific device")+"``")
 	cmd.Flags().StringArrayVarP(&c.flagProfile, "profile", "p", nil, i18n.G("Profile to apply to the target instance")+"``")
 	cmd.Flags().BoolVar(&c.flagNoProfiles, "no-profiles", false, i18n.G("Unset all profiles on the target instance"))
-	cmd.Flags().BoolVar(&c.flagContainerOnly, "container-only", false, i18n.G("Move the instance without its snapshots (deprecated, use instance-only)"))
 	cmd.Flags().BoolVar(&c.flagInstanceOnly, "instance-only", false, i18n.G("Move the instance without its snapshots"))
 	cmd.Flags().StringVar(&c.flagMode, "mode", moveDefaultMode, i18n.G("Transfer mode. One of pull (default), push or relay.")+"``")
 	cmd.Flags().BoolVar(&c.flagStateless, "stateless", false, i18n.G("Copy a stateful instance stateless"))

From 3521c6ec80e43f43ac29b25e87c34cf8cf14b03e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 25 Mar 2020 13:23:55 -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/bg.po      |  80 +++++++++++++++---------------------
 po/de.po      |  99 +++++++++++++++++++++++----------------------
 po/el.po      |  80 +++++++++++++++---------------------
 po/es.po      |  80 +++++++++++++++---------------------
 po/fa.po      |  80 +++++++++++++++---------------------
 po/fi.po      |  80 +++++++++++++++---------------------
 po/fr.po      | 100 ++++++++++++++++++++++-----------------------
 po/hi.po      |  80 +++++++++++++++---------------------
 po/id.po      |  80 +++++++++++++++---------------------
 po/it.po      |  80 +++++++++++++++---------------------
 po/ja.po      | 109 +++++++++++++++++++++++++-------------------------
 po/ko.po      |  80 +++++++++++++++---------------------
 po/lxd.pot    |  76 +++++++++++++++--------------------
 po/nb_NO.po   |  80 +++++++++++++++---------------------
 po/nl.po      |  80 +++++++++++++++---------------------
 po/pa.po      |  80 +++++++++++++++---------------------
 po/pl.po      |  80 +++++++++++++++---------------------
 po/pt_BR.po   |  80 +++++++++++++++---------------------
 po/ru.po      |  80 +++++++++++++++---------------------
 po/sl.po      |  80 +++++++++++++++---------------------
 po/sr.po      |  80 +++++++++++++++---------------------
 po/sv.po      |  80 +++++++++++++++---------------------
 po/te.po      |  80 +++++++++++++++---------------------
 po/tr.po      |  80 +++++++++++++++---------------------
 po/uk.po      |  80 +++++++++++++++---------------------
 po/zh_Hans.po |  80 +++++++++++++++---------------------
 26 files changed, 911 insertions(+), 1233 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index fe2116180e..591acc84fa 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index bc4681cc67..cd45ed1599 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2019-12-12 14:53+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -338,11 +338,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 #, fuzzy
 msgid "--refresh can only be used with instances"
 msgstr "--refresh kann nur mit Containern verwendet werden"
@@ -515,7 +515,7 @@ msgstr "automatisches Update: %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 #, fuzzy
 msgid "Backup exported successfully!"
 msgstr "Profil %s erstellt\n"
@@ -525,7 +525,7 @@ msgstr "Profil %s erstellt\n"
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -536,7 +536,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr "Ungültige Abbild Eigenschaft: %s\n"
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -617,7 +617,7 @@ msgstr ""
 "Optionen:\n"
 "\n"
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -693,8 +693,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -757,7 +757,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -800,17 +800,12 @@ msgstr "Anhalten des Containers fehlgeschlagen!"
 msgid "Copy the instance without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/copy.go:51
-#, fuzzy
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr "Herunterfahren des Containers erzwingen."
-
 #: lxc/storage_volume.go:307
 #, fuzzy
 msgid "Copy the volume without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -912,7 +907,7 @@ msgstr "Fehlerhafte Profil URL %s"
 msgid "Create storage pools"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 #, fuzzy
 msgid "Create the instance with no profiles applied"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -954,7 +949,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1318,7 +1313,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Export instances as backup tarballs."
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -1337,7 +1332,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr "FINGERABDRUCK"
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 #, fuzzy
 msgid "Failed to connect to cluster member"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -1347,7 +1342,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 #, fuzzy
 msgid "Failed to get the new instance name"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -1630,7 +1625,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -2135,11 +2130,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2248,14 +2243,9 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid "Move storage volumes between pools"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/move.go:55
-#, fuzzy
-msgid "Move the instance without its snapshots"
-msgstr "Herunterfahren des Containers erzwingen."
-
 #: lxc/move.go:54
 #, fuzzy
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/storage_volume.go:366
@@ -2469,7 +2459,7 @@ msgstr "Administrator Passwort für %s: "
 msgid "Pause instances"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2664,7 +2654,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Herunterfahren des Containers erzwingen."
@@ -3236,7 +3226,7 @@ msgstr "Profil %s gelöscht\n"
 msgid "Storage pool %s pending on member %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 #, fuzzy
 msgid "Storage pool name"
 msgstr "Profilname kann nicht geändert werden"
@@ -3301,15 +3291,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3353,7 +3343,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3415,7 +3405,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3437,7 +3427,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3446,7 +3436,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -3546,7 +3536,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3604,13 +3594,6 @@ msgstr ""
 
 #: lxc/export.go:41
 #, fuzzy
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr "Zustand des laufenden Containers sichern oder nicht"
-
-#: lxc/export.go:43
-#, fuzzy
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "Zustand des laufenden Containers sichern oder nicht"
 
@@ -3642,12 +3625,12 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 #, fuzzy
 msgid "You must specify a destination instance name when using --target"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 #, fuzzy
 msgid "You must specify a source instance name"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
@@ -4876,6 +4859,22 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Copy the instance without its snapshots (deprecated, use instance-only)"
+#~ msgstr "Herunterfahren des Containers erzwingen."
+
+#, fuzzy
+#~ msgid ""
+#~ "Move the instance without its snapshots (deprecated, use instance-only)"
+#~ msgstr "Herunterfahren des Containers erzwingen."
+
+#, fuzzy
+#~ msgid ""
+#~ "Whether or not to only backup the container (without snapshots), "
+#~ "(deprecated, use instance-only)"
+#~ msgstr "Zustand des laufenden Containers sichern oder nicht"
+
 #, fuzzy
 #~ msgid "Missing container.name name"
 #~ msgstr "der Name des Ursprung Containers muss angegeben werden"
diff --git a/po/el.po b/po/el.po
index 1db77c01eb..77831fca6d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -211,11 +211,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -377,7 +377,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -397,7 +397,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -539,8 +539,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -600,7 +600,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -640,15 +640,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -739,7 +735,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -779,7 +775,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1119,7 +1115,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1138,7 +1134,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1147,7 +1143,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1419,7 +1415,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1883,11 +1879,11 @@ msgstr "  Χρήση μνήμης:"
 msgid "Memory:"
 msgstr "  Χρήση μνήμης:"
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1988,12 +1984,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2202,7 +2194,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2389,7 +2381,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2929,7 +2921,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2990,15 +2982,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3039,7 +3031,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3097,7 +3089,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3119,7 +3111,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3128,7 +3120,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3223,7 +3215,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3276,12 +3268,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3308,11 +3294,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index ff6c30ad62..627680641a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -332,12 +332,12 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 #, fuzzy
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr "--container-only no se puede pasar cuando la fuente es una instantánea"
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -500,7 +500,7 @@ msgstr "Auto actualización: %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -509,7 +509,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -520,7 +520,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr "Propiedad mala: %s"
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -592,7 +592,7 @@ msgstr "Cacheado: %s"
 msgid "Caches:"
 msgstr "Cacheado: %s"
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -665,8 +665,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -728,7 +728,7 @@ msgstr "Log de la consola:"
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -768,15 +768,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -913,7 +909,7 @@ msgstr "CONTROLADOR"
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1255,7 +1251,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "Export instances as backup tarballs."
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -1274,7 +1270,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr "HUELLA DIGITAL"
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1283,7 +1279,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 #, fuzzy
 msgid "Failed to get the new instance name"
 msgstr "Perfil para aplicar al nuevo contenedor"
@@ -1558,7 +1554,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr "Nombre del contenedor es obligatorio"
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Nombre del contenedor es: %s"
@@ -2022,11 +2018,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2130,12 +2126,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2343,7 +2335,7 @@ msgstr "Contraseña admin para %s:"
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2533,7 +2525,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -3075,7 +3067,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -3136,15 +3128,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3185,7 +3177,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3243,7 +3235,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3265,7 +3257,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3274,7 +3266,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
@@ -3369,7 +3361,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3422,12 +3414,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3454,11 +3440,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index b023d6e45e..123d24df1e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 38f63429e5..e90d5472a4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 0b72661f65..77e7d3d697 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2019-01-04 18:07+0000\n"
 "Last-Translator: Deleted User <noreply+12102 at weblate.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -332,11 +332,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr "Mise à jour auto. : %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 #, fuzzy
 msgid "Backup exported successfully!"
 msgstr "Image copiée avec succès !"
@@ -516,7 +516,7 @@ msgstr "Image copiée avec succès !"
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -527,7 +527,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr "Mauvaise propriété : %s"
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -599,7 +599,7 @@ msgstr "Créé : %s"
 msgid "Caches:"
 msgstr "Créé : %s"
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -675,8 +675,8 @@ msgid "Client version: %s\n"
 msgstr "Afficher la version du client"
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -745,7 +745,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -788,17 +788,12 @@ msgstr "Copie de l'image : %s"
 msgid "Copy the instance without its snapshots"
 msgstr "Copiez le conteneur sans ses instantanés"
 
-#: lxc/copy.go:51
-#, fuzzy
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr "Copiez le conteneur sans ses instantanés"
-
 #: lxc/storage_volume.go:307
 #, fuzzy
 msgid "Copy the volume without its snapshots"
 msgstr "Copiez le conteneur sans ses instantanés"
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -917,7 +912,7 @@ msgstr "Créé : %s"
 msgid "Create storage pools"
 msgstr "Copie de l'image : %s"
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 #, fuzzy
 msgid "Create the instance with no profiles applied"
 msgstr "L'arrêt du conteneur a échoué !"
@@ -959,7 +954,7 @@ msgstr "PILOTE"
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 #, fuzzy
 msgid "Define a compression algorithm: for backup or none"
 msgstr "Définir un algorithme de compression : pour image ou aucun"
@@ -1327,7 +1322,7 @@ msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 msgid "Export instances as backup tarballs."
 msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "Import de l'image : %s"
@@ -1347,7 +1342,7 @@ msgstr "NOM"
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 #, fuzzy
 msgid "Failed to connect to cluster member"
 msgstr "Profil à appliquer au nouveau conteneur"
@@ -1357,7 +1352,7 @@ msgstr "Profil à appliquer au nouveau conteneur"
 msgid "Failed to create alias %s"
 msgstr "Échec lors de la génération de 'lxc.%s.1': %v"
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 #, fuzzy
 msgid "Failed to get the new instance name"
 msgstr "Profil à appliquer au nouveau conteneur"
@@ -1649,7 +1644,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr "Le nom du conteneur est obligatoire"
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Le nom du conteneur est : %s"
@@ -2189,12 +2184,12 @@ msgstr "  Mémoire utilisée :"
 msgid "Memory:"
 msgstr "  Mémoire utilisée :"
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 #, fuzzy
 msgid "Migration API failure"
 msgstr "Échec lors de la migration vers l'hôte source: %s"
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2306,14 +2301,9 @@ msgstr "Forcer le conteneur à s'arrêter"
 msgid "Move storage volumes between pools"
 msgstr "Copie de l'image : %s"
 
-#: lxc/move.go:55
-#, fuzzy
-msgid "Move the instance without its snapshots"
-msgstr "Forcer le conteneur à s'arrêter"
-
 #: lxc/move.go:54
 #, fuzzy
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
 
 #: lxc/storage_volume.go:366
@@ -2535,7 +2525,7 @@ msgstr "Mot de passe administrateur pour %s : "
 msgid "Pause instances"
 msgstr "Création du conteneur"
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2731,7 +2721,7 @@ msgstr "Pousser ou récupérer des fichiers récursivement"
 msgid "Refresh images"
 msgstr "Récupération de l'image : %s"
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
@@ -3313,7 +3303,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:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr "Nom de l'ensemble de stockage"
 
@@ -3379,15 +3369,15 @@ msgstr ""
 msgid "TYPE"
 msgstr "TYPE"
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3437,7 +3427,7 @@ msgstr "L'image locale '%s' n'a pas été trouvée, essayer '%s:' à la place."
 msgid "The profile device doesn't exist"
 msgstr "Le périphérique indiqué n'existe pas"
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3499,7 +3489,7 @@ msgstr ""
 "Pour démarrer votre premier conteneur, essayer : lxc launch ubuntu:16.04"
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3521,7 +3511,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3530,7 +3520,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr "Transfert de l'image : %s"
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "Transfert de l'image : %s"
@@ -3633,7 +3623,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr "Publié : %s"
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3688,13 +3678,6 @@ msgstr ""
 
 #: lxc/export.go:41
 #, fuzzy
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
-
-#: lxc/export.go:43
-#, fuzzy
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
 
@@ -3726,12 +3709,12 @@ msgstr "Il est impossible de passer -t et -T simultanément"
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr "impossible de copier vers le même nom de conteneur"
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 #, fuzzy
 msgid "You must specify a destination instance name when using --target"
 msgstr "vous devez spécifier un nom de conteneur source"
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 #, fuzzy
 msgid "You must specify a source instance name"
 msgstr "vous devez spécifier un nom de conteneur source"
@@ -5047,6 +5030,23 @@ msgstr ""
 msgid "yes"
 msgstr "oui"
 
+#, fuzzy
+#~ msgid ""
+#~ "Copy the instance without its snapshots (deprecated, use instance-only)"
+#~ msgstr "Copiez le conteneur sans ses instantanés"
+
+#, fuzzy
+#~ msgid ""
+#~ "Move the instance without its snapshots (deprecated, use instance-only)"
+#~ msgstr "Forcer le conteneur à s'arrêter"
+
+#, fuzzy
+#~ msgid ""
+#~ "Whether or not to only backup the container (without snapshots), "
+#~ "(deprecated, use instance-only)"
+#~ msgstr ""
+#~ "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
+
 #~ msgid "ARCH"
 #~ msgstr "ARCH"
 
diff --git a/po/hi.po b/po/hi.po
index af3f4c7f0a..5abfa5ae2a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 4f220106ac..99090be94d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index f092e3115c..2af8a1ef12 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Luigi Operoso <brokenpip3 at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -324,11 +324,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -490,7 +490,7 @@ msgstr "Aggiornamento automatico: %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -499,7 +499,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -510,7 +510,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr "Proprietà errata: %s"
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -581,7 +581,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -653,8 +653,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -714,7 +714,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -754,15 +754,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -859,7 +855,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -900,7 +896,7 @@ msgstr "DRIVER"
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1244,7 +1240,7 @@ msgstr "Creazione del container in corso"
 msgid "Export instances as backup tarballs."
 msgstr "Creazione del container in corso"
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "Creazione del container in corso"
@@ -1263,7 +1259,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1272,7 +1268,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1547,7 +1543,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Il nome del container è: %s"
@@ -2016,11 +2012,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2123,12 +2119,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2337,7 +2329,7 @@ msgstr "Password amministratore per %s: "
 msgid "Pause instances"
 msgstr "Creazione del container in corso"
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2526,7 +2518,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Creazione del container in corso"
@@ -3071,7 +3063,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -3133,15 +3125,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3183,7 +3175,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr "il remote %s non esiste"
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3241,7 +3233,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3263,7 +3255,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3272,7 +3264,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "Creazione del container in corso"
@@ -3368,7 +3360,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3421,12 +3413,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3453,12 +3439,12 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 #, fuzzy
 msgid "You must specify a destination instance name when using --target"
 msgstr "Occorre specificare un nome di container come origine"
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 #, fuzzy
 msgid "You must specify a source instance name"
 msgstr "Occorre specificare un nome di container come origine"
diff --git a/po/ja.po b/po/ja.po
index 2b99754cd8..91d29df8eb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-06 14:23+0000\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2020-03-12 15:28+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
-"Language-Team: Japanese <https://hosted.weblate.org/projects/"
-"linux-containers/lxd/ja/>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
+"containers/lxd/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -324,11 +324,11 @@ msgstr "- ポート %d (%s)"
 msgid "--empty cannot be combined with an image name"
 msgstr "--empty はイメージ名と同時に指定できません"
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr "--instance-only はコピー元がスナップショットの場合は指定できません"
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr "--refresh はインスタンスの場合のみ使えます"
 
@@ -501,7 +501,7 @@ msgstr "自動更新: %s"
 msgid "BASE IMAGE"
 msgstr "BASE IMAGE"
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr "バックアップのエクスポートが成功しました!"
 
@@ -510,7 +510,7 @@ msgstr "バックアップのエクスポートが成功しました!"
 msgid "Bad key/value pair: %s"
 msgstr "不適切なキー/値のペア: %s"
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -521,7 +521,7 @@ msgstr "不適切な キー=値 のペア: %s"
 msgid "Bad property: %s"
 msgstr "不正なイメージプロパティ形式: %s"
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -592,7 +592,7 @@ msgstr "キャッシュ済: %s"
 msgid "Caches:"
 msgstr "キャッシュ:"
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr "ローカル上のリネームでは、設定やプロファイルの上書きはできません"
 
@@ -664,8 +664,8 @@ msgid "Client version: %s\n"
 msgstr "クライアントバージョン: %s\n"
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -729,7 +729,7 @@ msgstr "コンソールログ:"
 msgid "Control: %s (%s)"
 msgstr "コントロール: %s (%s)"
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr "ステートフルなインスタンスをステートレスにコピーします"
 
@@ -773,17 +773,11 @@ msgstr "ストレージボリュームをコピーします"
 msgid "Copy the instance without its snapshots"
 msgstr "インスタンスをコピーします。スナップショットはコピーしません"
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-"インスタンスをコピーします。スナップショットはコピーしません (廃止予定、"
-"instance-only を使ってください)"
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr "ボリュームをコピーします (スナップショットはコピーしません)"
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr "コピー/移動元とは異なるプロジェクトにコピーします"
 
@@ -878,7 +872,7 @@ msgstr "プロジェクトを作成します"
 msgid "Create storage pools"
 msgstr "ストレージプールを作成します"
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr "プロファイルを適用しないインスタンスを作成します"
 
@@ -918,7 +912,7 @@ msgstr "DRIVER"
 msgid "DRM:"
 msgstr "DRM:"
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr "圧縮アルゴリズムを指定します: backup or none"
 
@@ -1284,7 +1278,7 @@ msgstr "インスタンスのバックアップをエクスポートします"
 msgid "Export instances as backup tarballs."
 msgstr "インスタンスを tarball 形式のバックアップとしてエクスポートします。"
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr "バックアップのエクスポート中: %s"
@@ -1303,7 +1297,7 @@ msgstr "FILENAME"
 msgid "FINGERPRINT"
 msgstr "FINGERPRINT"
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr "クラスタメンバへの接続に失敗しました"
 
@@ -1312,7 +1306,7 @@ msgstr "クラスタメンバへの接続に失敗しました"
 msgid "Failed to create alias %s"
 msgstr "エイリアス %s の作成に失敗しました"
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr "新しいインスタンス名が取得できません"
 
@@ -1605,7 +1599,7 @@ msgstr "入力するデータ"
 msgid "Instance name is mandatory"
 msgstr "インスタンス名を指定する必要があります"
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr "インスタンス名: %s"
@@ -2177,11 +2171,11 @@ msgstr "メモリ消費量:"
 msgid "Memory:"
 msgstr "メモリ:"
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr "マイグレーション API が失敗しました"
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr "マイグレーションが失敗しました"
 
@@ -2287,16 +2281,10 @@ msgstr "LXD サーバ内もしくはサーバ間でインスタンスを移動
 msgid "Move storage volumes between pools"
 msgstr "プール間でストレージボリュームを移動します"
 
-#: lxc/move.go:55
+#: lxc/move.go:54
 msgid "Move the instance without its snapshots"
 msgstr "インスタンスを移動します。スナップショットは移動しません"
 
-#: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-"インスタンスを移動します。スナップショットは移動しません (廃止予定、instance-"
-"only を使ってください)"
-
 #: lxc/storage_volume.go:366
 #, c-format
 msgid "Moving the storage volume: %s"
@@ -2502,7 +2490,7 @@ msgstr "%s のパスワード: "
 msgid "Pause instances"
 msgstr "インスタンスを一時停止します"
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr "インクリメンタルコピーを実行します"
 
@@ -2689,7 +2677,7 @@ msgstr "再帰的にファイルを転送します"
 msgid "Refresh images"
 msgstr "イメージを更新します"
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr "インスタンスの更新中: %s"
@@ -3268,7 +3256,7 @@ msgstr "ストレージプール %s を削除しました"
 msgid "Storage pool %s pending on member %s"
 msgstr "ストレージプール %s はメンバ %s 上でペンディング状態です"
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr "ストレージプール名"
 
@@ -3329,15 +3317,15 @@ msgstr "TARGET"
 msgid "TYPE"
 msgstr "TYPE"
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr "--instance-only と --target は同時に指定できません"
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr "--mode と --target は同時に指定できません"
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr "--stateless と --target は同時に指定できません"
 
@@ -3383,7 +3371,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr "プロファイルのデバイスが存在しません"
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr "移動元の LXD サーバはクラスタに属していません"
 
@@ -3457,7 +3445,7 @@ msgstr ""
 "ください"
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 "--target オプションは、コピー先のリモートサーバがクラスタに属していなければな"
@@ -3481,7 +3469,7 @@ msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpu
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpull)"
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpull)。"
 
@@ -3490,7 +3478,7 @@ msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpu
 msgid "Transferring image: %s"
 msgstr "イメージを転送中: %s"
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr "インスタンスを転送中: %s"
@@ -3585,7 +3573,7 @@ msgstr "サポートされていないインスタンスタイプです: %s"
 msgid "Uploaded: %s"
 msgstr "アップロード日時: %s"
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3642,14 +3630,6 @@ msgid "Wait for the operation to complete"
 msgstr "処理が完全に終わるまで待ちます"
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-"スナップショットを含めずにコンテナのみをバックアップするかどうか (廃止予定、"
-"instance-only を使ってください)"
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr "スナップショットを含めずにインスタンスのみをバックアップするかどうか"
 
@@ -3678,12 +3658,12 @@ msgstr "-t と -T は同時に指定できません"
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr "--mode と同時に -t または -T は指定できません"
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 "--target オプションを使うときはコピー先のインスタンス名を指定してください"
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr "コピー元のインスタンス名を指定してください"
 
@@ -4767,6 +4747,25 @@ msgstr "y"
 msgid "yes"
 msgstr "yes"
 
+#~ msgid ""
+#~ "Copy the instance without its snapshots (deprecated, use instance-only)"
+#~ msgstr ""
+#~ "インスタンスをコピーします。スナップショットはコピーしません (廃止予定、"
+#~ "instance-only を使ってください)"
+
+#~ msgid ""
+#~ "Move the instance without its snapshots (deprecated, use instance-only)"
+#~ msgstr ""
+#~ "インスタンスを移動します。スナップショットは移動しません (廃止予定、"
+#~ "instance-only を使ってください)"
+
+#~ msgid ""
+#~ "Whether or not to only backup the container (without snapshots), "
+#~ "(deprecated, use instance-only)"
+#~ msgstr ""
+#~ "スナップショットを含めずにコンテナのみをバックアップするかどうか (廃止予"
+#~ "定、instance-only を使ってください)"
+
 #~ msgid "--target cannot be used with containers"
 #~ msgstr "--target はコンテナでは使えません"
 
diff --git a/po/ko.po b/po/ko.po
index c06113d777..49a53b2ff3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/lxd.pot b/po/lxd.pot
index 9cfaa53926..387be6427a 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2020-03-19 10:47-0400\n"
+        "POT-Creation-Date: 2020-03-25 13:23-0400\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -200,11 +200,11 @@ msgstr  ""
 msgid   "--empty cannot be combined with an image name"
 msgstr  ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid   "--instance-only can't be passed when the source is a snapshot"
 msgstr  ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid   "--refresh can only be used with instances"
 msgstr  ""
 
@@ -361,7 +361,7 @@ msgstr  ""
 msgid   "BASE IMAGE"
 msgstr  ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid   "Backup exported successfully!"
 msgstr  ""
 
@@ -370,7 +370,7 @@ msgstr  ""
 msgid   "Bad key/value pair: %s"
 msgstr  ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172 lxc/storage.go:123 lxc/storage_volume.go:505
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172 lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid   "Bad key=value pair: %s"
 msgstr  ""
@@ -380,7 +380,7 @@ msgstr  ""
 msgid   "Bad property: %s"
 msgstr  ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid   "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr  ""
@@ -450,7 +450,7 @@ msgstr  ""
 msgid   "Caches:"
 msgstr  ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid   "Can't override configuration or profiles in local rename"
 msgstr  ""
 
@@ -520,7 +520,7 @@ msgstr  ""
 msgid   "Client version: %s\n"
 msgstr  ""
 
-#: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601 lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54 lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730 lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146 lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588 lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306 lxc/storage_volume.go:466 lxc/storage_volume.go:543 lxc/storage_volume.go:785 lxc/storage_volume.go:982 lxc/storage_volume.go:1147 lxc/storage_volume.go:1177 lxc/storage_volume.go:1293 lxc/storage_volume.go:1372 lxc/storage_volume.go:1465
+#: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601 lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54 lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730 lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146 lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588 lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306 lxc/storage_volume.go:466 lxc/storage_volume.go:543 lxc/storage_volume.go:785 lxc/storage_volume.go:982 lxc/storage_volume.go:1147 lxc/storage_volume.go:1177 lxc/storage_volume.go:1293 lxc/storage_volume.go:1372 lxc/storage_volume.go:1465
 msgid   "Cluster member name"
 msgstr  ""
 
@@ -569,7 +569,7 @@ msgstr  ""
 msgid   "Control: %s (%s)"
 msgstr  ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid   "Copy a stateful instance stateless"
 msgstr  ""
 
@@ -608,15 +608,11 @@ msgstr  ""
 msgid   "Copy the instance without its snapshots"
 msgstr  ""
 
-#: lxc/copy.go:51
-msgid   "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr  ""
-
 #: lxc/storage_volume.go:307
 msgid   "Copy the volume without its snapshots"
 msgstr  ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid   "Copy to a project different from the source"
 msgstr  ""
 
@@ -706,7 +702,7 @@ msgstr  ""
 msgid   "Create storage pools"
 msgstr  ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid   "Create the instance with no profiles applied"
 msgstr  ""
 
@@ -745,7 +741,7 @@ msgstr  ""
 msgid   "DRM:"
 msgstr  ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid   "Define a compression algorithm: for backup or none"
 msgstr  ""
 
@@ -1025,7 +1021,7 @@ msgstr  ""
 msgid   "Export instances as backup tarballs."
 msgstr  ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid   "Exporting the backup: %s"
 msgstr  ""
@@ -1043,7 +1039,7 @@ msgstr  ""
 msgid   "FINGERPRINT"
 msgstr  ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid   "Failed to connect to cluster member"
 msgstr  ""
 
@@ -1052,7 +1048,7 @@ msgstr  ""
 msgid   "Failed to create alias %s"
 msgstr  ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid   "Failed to get the new instance name"
 msgstr  ""
 
@@ -1312,7 +1308,7 @@ msgstr  ""
 msgid   "Instance name is mandatory"
 msgstr  ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid   "Instance name is: %s"
 msgstr  ""
@@ -1761,11 +1757,11 @@ msgstr  ""
 msgid   "Memory:"
 msgstr  ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid   "Migration API failure"
 msgstr  ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid   "Migration operation failure"
 msgstr  ""
 
@@ -1845,12 +1841,8 @@ msgstr  ""
 msgid   "Move storage volumes between pools"
 msgstr  ""
 
-#: lxc/move.go:55
-msgid   "Move the instance without its snapshots"
-msgstr  ""
-
 #: lxc/move.go:54
-msgid   "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid   "Move the instance without its snapshots"
 msgstr  ""
 
 #: lxc/storage_volume.go:366
@@ -2055,7 +2047,7 @@ msgstr  ""
 msgid   "Pause instances"
 msgstr  ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid   "Perform an incremental copy"
 msgstr  ""
 
@@ -2240,7 +2232,7 @@ msgstr  ""
 msgid   "Refresh images"
 msgstr  ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid   "Refreshing instance: %s"
 msgstr  ""
@@ -2760,7 +2752,7 @@ msgstr  ""
 msgid   "Storage pool %s pending on member %s"
 msgstr  ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid   "Storage pool name"
 msgstr  ""
 
@@ -2820,15 +2812,15 @@ msgstr  ""
 msgid   "TYPE"
 msgstr  ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid   "The --instance-only flag can't be used with --target"
 msgstr  ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid   "The --mode flag can't be used with --target"
 msgstr  ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid   "The --stateless flag can't be used with --target"
 msgstr  ""
 
@@ -2866,7 +2858,7 @@ msgstr  ""
 msgid   "The profile device doesn't exist"
 msgstr  ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid   "The source LXD server is not clustered"
 msgstr  ""
 
@@ -2918,7 +2910,7 @@ msgstr  ""
 msgid   "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr  ""
 
-#: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634 lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634 lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid   "To use --target, the destination remote must be a cluster"
 msgstr  ""
 
@@ -2940,7 +2932,7 @@ msgstr  ""
 msgid   "Transfer mode. One of pull (default), push or relay"
 msgstr  ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid   "Transfer mode. One of pull (default), push or relay."
 msgstr  ""
 
@@ -2949,7 +2941,7 @@ msgstr  ""
 msgid   "Transferring image: %s"
 msgstr  ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid   "Transferring instance: %s"
 msgstr  ""
@@ -3043,7 +3035,7 @@ msgstr  ""
 msgid   "Uploaded: %s"
 msgstr  ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid   "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr  ""
 
@@ -3094,10 +3086,6 @@ msgid   "Wait for the operation to complete"
 msgstr  ""
 
 #: lxc/export.go:41
-msgid   "Whether or not to only backup the container (without snapshots), (deprecated, use instance-only)"
-msgstr  ""
-
-#: lxc/export.go:43
 msgid   "Whether or not to only backup the instance (without snapshots)"
 msgstr  ""
 
@@ -3121,11 +3109,11 @@ msgstr  ""
 msgid   "You can't pass -t or -T at the same time as --mode"
 msgstr  ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid   "You must specify a destination instance name when using --target"
 msgstr  ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid   "You must specify a source instance name"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 23e7d1519e..1fa40f6435 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 0ac3f41a38..8e8345c8f2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -325,11 +325,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -491,7 +491,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -500,7 +500,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -511,7 +511,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -581,7 +581,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -652,8 +652,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -713,7 +713,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -753,15 +753,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -852,7 +848,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -892,7 +888,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1229,7 +1225,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1248,7 +1244,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1257,7 +1253,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1529,7 +1525,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1991,11 +1987,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2096,12 +2092,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2309,7 +2301,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2496,7 +2488,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -3036,7 +3028,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -3097,15 +3089,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3146,7 +3138,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3204,7 +3196,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3226,7 +3218,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3235,7 +3227,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3330,7 +3322,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3383,12 +3375,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3415,11 +3401,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 556cb2be99..09325f5e20 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 6c985fdfc9..4f23eab627 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2018-09-08 19:22+0000\n"
 "Last-Translator: m4sk1n <me at m4sk.in>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/linux-containers/"
@@ -335,11 +335,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -501,7 +501,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -510,7 +510,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -521,7 +521,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -591,7 +591,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -662,8 +662,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -723,7 +723,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -763,15 +763,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -862,7 +858,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -902,7 +898,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1239,7 +1235,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1258,7 +1254,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1267,7 +1263,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1539,7 +1535,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -2001,11 +1997,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2106,12 +2102,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2319,7 +2311,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2506,7 +2498,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -3046,7 +3038,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -3107,15 +3099,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3156,7 +3148,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3214,7 +3206,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3236,7 +3228,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3245,7 +3237,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3340,7 +3332,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3393,12 +3385,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3425,11 +3411,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e99ad78df1..f01cd1686d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -335,12 +335,12 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr "--refresh só pode ser usado com containers"
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 #, fuzzy
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr "--container-only não pode ser passado quando a fonte é um snapshot"
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 #, fuzzy
 msgid "--refresh can only be used with instances"
 msgstr "--refresh só pode ser usado com containers"
@@ -511,7 +511,7 @@ msgstr "Atualização automática: %s"
 msgid "BASE IMAGE"
 msgstr "IMAGEM BASE"
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr "Backup exportado com sucesso!"
 
@@ -520,7 +520,7 @@ msgstr "Backup exportado com sucesso!"
 msgid "Bad key/value pair: %s"
 msgstr "par de chave/valor inválido %s"
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -531,7 +531,7 @@ msgstr "par de chave=valor inválido %s"
 msgid "Bad property: %s"
 msgstr "Propriedade ruim: %s"
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr "Erro de sintaxe, esperado <dispositivo>,<chave>=<valor>: %s"
@@ -602,7 +602,7 @@ msgstr "Em cache: %s"
 msgid "Caches:"
 msgstr "Em cache: %s"
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -674,8 +674,8 @@ msgid "Client version: %s\n"
 msgstr "Versão do cliente: %s\n"
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -742,7 +742,7 @@ msgstr "Log de Console:"
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -783,15 +783,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -890,7 +886,7 @@ msgstr "Criar projetos"
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -931,7 +927,7 @@ msgstr "DRIVER"
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 #, fuzzy
 msgid "Define a compression algorithm: for backup or none"
 msgstr "Definir um algoritmo de compressão: para imagem ou nenhum"
@@ -1281,7 +1277,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1300,7 +1296,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1309,7 +1305,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1585,7 +1581,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -2052,11 +2048,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2157,12 +2153,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2370,7 +2362,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2562,7 +2554,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Editar arquivos no container"
@@ -3111,7 +3103,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -3173,15 +3165,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3222,7 +3214,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3280,7 +3272,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3302,7 +3294,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3311,7 +3303,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "Editar arquivos no container"
@@ -3410,7 +3402,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3463,12 +3455,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3495,11 +3481,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 4872a20e81..e1754843e2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2018-06-22 15:57+0000\n"
 "Last-Translator: Александр Киль <shorrey at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -336,11 +336,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -505,7 +505,7 @@ msgstr "Авто-обновление: %s"
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -514,7 +514,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -525,7 +525,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -597,7 +597,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -669,8 +669,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -730,7 +730,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -771,15 +771,11 @@ msgstr "Копирование образа: %s"
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -878,7 +874,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr "Копирование образа: %s"
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 #, fuzzy
 msgid "Create the instance with no profiles applied"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -920,7 +916,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1270,7 +1266,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Export instances as backup tarballs."
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, fuzzy, c-format
 msgid "Exporting the backup: %s"
 msgstr "Копирование образа: %s"
@@ -1289,7 +1285,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1298,7 +1294,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1574,7 +1570,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr "Имя контейнера является обязательным"
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, fuzzy, c-format
 msgid "Instance name is: %s"
 msgstr "Имя контейнера: %s"
@@ -2048,11 +2044,11 @@ msgstr " Использование памяти:"
 msgid "Memory:"
 msgstr " Использование памяти:"
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -2157,12 +2153,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr "Копирование образа: %s"
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2372,7 +2364,7 @@ msgstr "Пароль администратора для %s: "
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2560,7 +2552,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr "Копирование образа: %s"
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, fuzzy, c-format
 msgid "Refreshing instance: %s"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -3111,7 +3103,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -3173,15 +3165,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3222,7 +3214,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3280,7 +3272,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3302,7 +3294,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3311,7 +3303,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, fuzzy, c-format
 msgid "Transferring instance: %s"
 msgstr "Невозможно добавить имя контейнера в список"
@@ -3406,7 +3398,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3459,12 +3451,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3491,11 +3477,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 2030ee0e96..7a52c7c680 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index ad42092e6d..af418bde31 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 08da2359f2..f181539adb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index a489cea0d0..42eaac107f 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 68e7a24e58..dcafe672d9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 6295189d2d..e449560ffc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -535,8 +535,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -636,15 +636,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -735,7 +731,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -775,7 +771,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1112,7 +1108,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1131,7 +1127,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1140,7 +1136,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1412,7 +1408,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1874,11 +1870,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1979,12 +1975,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2192,7 +2184,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2379,7 +2371,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2919,7 +2911,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2980,15 +2972,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3029,7 +3021,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3087,7 +3079,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3109,7 +3101,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3118,7 +3110,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3213,7 +3205,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3266,12 +3258,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3298,11 +3284,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index d11c53d649..4140ab7ce9 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-03-17 12:09-0400\n"
+"POT-Creation-Date: 2020-03-25 13:23-0400\n"
 "PO-Revision-Date: 2018-09-11 19:15+0000\n"
 "Last-Translator: 0x0916 <w at laoqinren.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -211,11 +211,11 @@ msgstr ""
 msgid "--empty cannot be combined with an image name"
 msgstr ""
 
-#: lxc/copy.go:153
+#: lxc/copy.go:152
 msgid "--instance-only can't be passed when the source is a snapshot"
 msgstr ""
 
-#: lxc/copy.go:164
+#: lxc/copy.go:163
 msgid "--refresh can only be used with instances"
 msgstr ""
 
@@ -377,7 +377,7 @@ msgstr ""
 msgid "BASE IMAGE"
 msgstr ""
 
-#: lxc/export.go:136
+#: lxc/export.go:134
 msgid "Backup exported successfully!"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr ""
 msgid "Bad key/value pair: %s"
 msgstr ""
 
-#: lxc/copy.go:123 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
+#: lxc/copy.go:122 lxc/init.go:187 lxc/project.go:121 lxc/publish.go:172
 #: lxc/storage.go:123 lxc/storage_volume.go:505
 #, c-format
 msgid "Bad key=value pair: %s"
@@ -397,7 +397,7 @@ msgstr ""
 msgid "Bad property: %s"
 msgstr ""
 
-#: lxc/copy.go:134
+#: lxc/copy.go:133
 #, c-format
 msgid "Bad syntax, expecting <device>,<key>=<value>: %s"
 msgstr ""
@@ -467,7 +467,7 @@ msgstr ""
 msgid "Caches:"
 msgstr ""
 
-#: lxc/move.go:109
+#: lxc/move.go:108
 msgid "Can't override configuration or profiles in local rename"
 msgstr ""
 
@@ -538,8 +538,8 @@ msgid "Client version: %s\n"
 msgstr ""
 
 #: lxc/config.go:95 lxc/config.go:361 lxc/config.go:454 lxc/config.go:601
-#: lxc/config.go:719 lxc/copy.go:54 lxc/info.go:45 lxc/init.go:54
-#: lxc/move.go:59 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
+#: lxc/config.go:719 lxc/copy.go:53 lxc/info.go:45 lxc/init.go:54
+#: lxc/move.go:58 lxc/network.go:257 lxc/network.go:672 lxc/network.go:730
 #: lxc/network.go:1017 lxc/network.go:1084 lxc/network.go:1146
 #: lxc/storage.go:92 lxc/storage.go:336 lxc/storage.go:392 lxc/storage.go:588
 #: lxc/storage.go:655 lxc/storage.go:738 lxc/storage_volume.go:306
@@ -599,7 +599,7 @@ msgstr ""
 msgid "Control: %s (%s)"
 msgstr ""
 
-#: lxc/copy.go:52 lxc/move.go:57
+#: lxc/copy.go:51 lxc/move.go:56
 msgid "Copy a stateful instance stateless"
 msgstr ""
 
@@ -639,15 +639,11 @@ msgstr ""
 msgid "Copy the instance without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:51
-msgid "Copy the instance without its snapshots (deprecated, use instance-only)"
-msgstr ""
-
 #: lxc/storage_volume.go:307
 msgid "Copy the volume without its snapshots"
 msgstr ""
 
-#: lxc/copy.go:55 lxc/move.go:60
+#: lxc/copy.go:54 lxc/move.go:59
 msgid "Copy to a project different from the source"
 msgstr ""
 
@@ -738,7 +734,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/copy.go:56 lxc/init.go:55
+#: lxc/copy.go:55 lxc/init.go:55
 msgid "Create the instance with no profiles applied"
 msgstr ""
 
@@ -778,7 +774,7 @@ msgstr ""
 msgid "DRM:"
 msgstr ""
 
-#: lxc/export.go:46
+#: lxc/export.go:44
 msgid "Define a compression algorithm: for backup or none"
 msgstr ""
 
@@ -1115,7 +1111,7 @@ msgstr ""
 msgid "Export instances as backup tarballs."
 msgstr ""
 
-#: lxc/export.go:120
+#: lxc/export.go:118
 #, c-format
 msgid "Exporting the backup: %s"
 msgstr ""
@@ -1134,7 +1130,7 @@ msgstr ""
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/move.go:231
+#: lxc/move.go:230
 msgid "Failed to connect to cluster member"
 msgstr ""
 
@@ -1143,7 +1139,7 @@ msgstr ""
 msgid "Failed to create alias %s"
 msgstr ""
 
-#: lxc/copy.go:421
+#: lxc/copy.go:420
 msgid "Failed to get the new instance name"
 msgstr ""
 
@@ -1415,7 +1411,7 @@ msgstr ""
 msgid "Instance name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:427 lxc/init.go:343
+#: lxc/copy.go:426 lxc/init.go:343
 #, c-format
 msgid "Instance name is: %s"
 msgstr ""
@@ -1877,11 +1873,11 @@ msgstr ""
 msgid "Memory:"
 msgstr ""
 
-#: lxc/move.go:244
+#: lxc/move.go:243
 msgid "Migration API failure"
 msgstr ""
 
-#: lxc/move.go:249
+#: lxc/move.go:248
 msgid "Migration operation failure"
 msgstr ""
 
@@ -1982,12 +1978,8 @@ msgstr ""
 msgid "Move storage volumes between pools"
 msgstr ""
 
-#: lxc/move.go:55
-msgid "Move the instance without its snapshots"
-msgstr ""
-
 #: lxc/move.go:54
-msgid "Move the instance without its snapshots (deprecated, use instance-only)"
+msgid "Move the instance without its snapshots"
 msgstr ""
 
 #: lxc/storage_volume.go:366
@@ -2195,7 +2187,7 @@ msgstr ""
 msgid "Pause instances"
 msgstr ""
 
-#: lxc/copy.go:57
+#: lxc/copy.go:56
 msgid "Perform an incremental copy"
 msgstr ""
 
@@ -2382,7 +2374,7 @@ msgstr ""
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/copy.go:388
+#: lxc/copy.go:387
 #, c-format
 msgid "Refreshing instance: %s"
 msgstr ""
@@ -2922,7 +2914,7 @@ msgstr ""
 msgid "Storage pool %s pending on member %s"
 msgstr ""
 
-#: lxc/copy.go:53 lxc/import.go:35 lxc/init.go:52 lxc/move.go:58
+#: lxc/copy.go:52 lxc/import.go:35 lxc/init.go:52 lxc/move.go:57
 msgid "Storage pool name"
 msgstr ""
 
@@ -2983,15 +2975,15 @@ msgstr ""
 msgid "TYPE"
 msgstr ""
 
-#: lxc/move.go:161 lxc/move.go:165
+#: lxc/move.go:160 lxc/move.go:164
 msgid "The --instance-only flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:169
+#: lxc/move.go:168
 msgid "The --mode flag can't be used with --target"
 msgstr ""
 
-#: lxc/move.go:157
+#: lxc/move.go:156
 msgid "The --stateless flag can't be used with --target"
 msgstr ""
 
@@ -3032,7 +3024,7 @@ msgstr ""
 msgid "The profile device doesn't exist"
 msgstr ""
 
-#: lxc/move.go:236
+#: lxc/move.go:235
 msgid "The source LXD server is not clustered"
 msgstr ""
 
@@ -3090,7 +3082,7 @@ msgid "To start your first instance, try: lxc launch ubuntu:18.04"
 msgstr ""
 
 #: lxc/config.go:278 lxc/config.go:403 lxc/config.go:553 lxc/config.go:634
-#: lxc/copy.go:116 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
+#: lxc/copy.go:115 lxc/info.go:310 lxc/network.go:759 lxc/storage.go:420
 msgid "To use --target, the destination remote must be a cluster"
 msgstr ""
 
@@ -3112,7 +3104,7 @@ msgstr ""
 msgid "Transfer mode. One of pull (default), push or relay"
 msgstr ""
 
-#: lxc/move.go:56 lxc/storage_volume.go:305
+#: lxc/move.go:55 lxc/storage_volume.go:305
 msgid "Transfer mode. One of pull (default), push or relay."
 msgstr ""
 
@@ -3121,7 +3113,7 @@ msgstr ""
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/copy.go:354
+#: lxc/copy.go:353
 #, c-format
 msgid "Transferring instance: %s"
 msgstr ""
@@ -3216,7 +3208,7 @@ msgstr ""
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/export.go:45
+#: lxc/export.go:43
 msgid ""
 "Use storage driver optimized format (can only be restored on a similar pool)"
 msgstr ""
@@ -3269,12 +3261,6 @@ msgid "Wait for the operation to complete"
 msgstr ""
 
 #: lxc/export.go:41
-msgid ""
-"Whether or not to only backup the container (without snapshots), "
-"(deprecated, use instance-only)"
-msgstr ""
-
-#: lxc/export.go:43
 msgid "Whether or not to only backup the instance (without snapshots)"
 msgstr ""
 
@@ -3301,11 +3287,11 @@ msgstr ""
 msgid "You can't pass -t or -T at the same time as --mode"
 msgstr ""
 
-#: lxc/copy.go:82
+#: lxc/copy.go:81
 msgid "You must specify a destination instance name when using --target"
 msgstr ""
 
-#: lxc/copy.go:77 lxc/move.go:220
+#: lxc/copy.go:76 lxc/move.go:219
 msgid "You must specify a source instance name"
 msgstr ""
 

From e7a94c20aab3c1a1b5019fec530d840027e63445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 25 Mar 2020 13:26:19 -0400
Subject: [PATCH 3/3] tests: Move away from container-only
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>
---
 test/suites/backup.sh                              |  8 ++++----
 test/suites/container_local_cross_pool_handling.sh |  4 ++--
 test/suites/incremental_copy.sh                    |  2 +-
 test/suites/migration.sh                           | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/suites/backup.sh b/test/suites/backup.sh
index 23561812f1..422c050327 100644
--- a/test/suites/backup.sh
+++ b/test/suites/backup.sh
@@ -186,10 +186,10 @@ test_backup_import_with_project() {
 
   # create backup
   if [ "$lxd_backend" = "btrfs" ] || [ "$lxd_backend" = "zfs" ]; then
-    lxc export c1 "${LXD_DIR}/c1-optimized.tar.gz" --optimized-storage --container-only
+    lxc export c1 "${LXD_DIR}/c1-optimized.tar.gz" --optimized-storage --instance-only
   fi
 
-  lxc export c1 "${LXD_DIR}/c1.tar.gz" --container-only
+  lxc export c1 "${LXD_DIR}/c1.tar.gz" --instance-only
   lxc delete --force c1
 
   # import backup, and ensure it's valid and runnable
@@ -319,7 +319,7 @@ test_backup_export_with_project() {
   # container only
 
   if [ "$lxd_backend" = "btrfs" ] || [ "$lxd_backend" = "zfs" ]; then
-    lxc export c1 "${LXD_DIR}/c1-optimized.tar.gz" --optimized-storage --container-only
+    lxc export c1 "${LXD_DIR}/c1-optimized.tar.gz" --optimized-storage --instance-only
     tar -xzf "${LXD_DIR}/c1-optimized.tar.gz" -C "${LXD_DIR}/optimized"
 
     [ -f "${LXD_DIR}/optimized/backup/index.yaml" ]
@@ -327,7 +327,7 @@ test_backup_export_with_project() {
     [ ! -d "${LXD_DIR}/optimized/backup/snapshots" ]
   fi
 
-  lxc export c1 "${LXD_DIR}/c1.tar.gz" --container-only
+  lxc export c1 "${LXD_DIR}/c1.tar.gz" --instance-only
   tar -xzf "${LXD_DIR}/c1.tar.gz" -C "${LXD_DIR}/non-optimized"
 
   # check tarball content
diff --git a/test/suites/container_local_cross_pool_handling.sh b/test/suites/container_local_cross_pool_handling.sh
index dcf51cb557..abf3056a21 100644
--- a/test/suites/container_local_cross_pool_handling.sh
+++ b/test/suites/container_local_cross_pool_handling.sh
@@ -68,12 +68,12 @@ test_container_local_cross_pool_handling() {
         lxc init testimage c1
         lxc snapshot c1
         lxc snapshot c1
-        lxc copy c1 c2 -s "lxdtest-$(basename "${LXD_DIR}")-${driver}1" --container-only
+        lxc copy c1 c2 -s "lxdtest-$(basename "${LXD_DIR}")-${driver}1" --instance-only
         lxc storage volume show "lxdtest-$(basename "${LXD_DIR}")-${driver}1" container/c2
         ! lxc storage volume show "lxdtest-$(basename "${LXD_DIR}")-${driver}1" container/c2/snap0 || false
         ! lxc storage volume show "lxdtest-$(basename "${LXD_DIR}")-${driver}1" container/c2/snap1 || false
         lxc delete -f c2
-        lxc move c1 c2 -s "lxdtest-$(basename "${LXD_DIR}")-${driver}1" --container-only
+        lxc move c1 c2 -s "lxdtest-$(basename "${LXD_DIR}")-${driver}1" --instance-only
         ! lxc info c1 || false
         lxc storage volume show "lxdtest-$(basename "${LXD_DIR}")-${driver}1" container/c2
         ! lxc storage volume show "lxdtest-$(basename "${LXD_DIR}")-${driver}1" container/c2/snap0 || false
diff --git a/test/suites/incremental_copy.sh b/test/suites/incremental_copy.sh
index cec3528ad9..4f5b6d83ae 100644
--- a/test/suites/incremental_copy.sh
+++ b/test/suites/incremental_copy.sh
@@ -72,7 +72,7 @@ do_copy() {
   # Remove the testfile from c1 and refresh again
   lxc exec c1 -- rm /root/testfile1
   # shellcheck disable=2086
-  lxc copy c1 c2 --refresh --container-only ${pool}
+  lxc copy c1 c2 --refresh --instance-only ${pool}
   lxc start c2
   ! lxc exec c2 -- test -f /root/testfile1 || false
   lxc stop -f c2
diff --git a/test/suites/migration.sh b/test/suites/migration.sh
index 5dd0bcbacf..554709bce0 100644
--- a/test/suites/migration.sh
+++ b/test/suites/migration.sh
@@ -148,7 +148,7 @@ migration() {
   echo "after" | lxc file push - cccp/blah
 
   # Local container only copy.
-  lxc copy cccp udssr --container-only
+  lxc copy cccp udssr --instance-only
   [ "$(lxc info udssr | grep -c snap)" -eq 0 ]
   [ "$(lxc file pull udssr/blah -)" = "after" ]
   lxc delete udssr
@@ -160,7 +160,7 @@ migration() {
   lxc delete udssr
 
   # Remote container only copy.
-  lxc_remote copy l1:cccp l2:udssr --container-only
+  lxc_remote copy l1:cccp l2:udssr --instance-only
   [ "$(lxc_remote info l2:udssr | grep -c snap)" -eq 0 ]
   [ "$(lxc_remote file pull l2:udssr/blah -)" = "after" ]
   lxc_remote delete l2:udssr
@@ -172,7 +172,7 @@ migration() {
   lxc_remote delete l2:udssr
 
   # Remote container only move.
-  lxc_remote move l1:cccp l2:udssr --container-only --mode=relay
+  lxc_remote move l1:cccp l2:udssr --instance-only --mode=relay
   ! lxc_remote info l1:cccp || false
   [ "$(lxc_remote info l2:udssr | grep -c snap)" -eq 0 ]
   lxc_remote delete l2:udssr
@@ -206,7 +206,7 @@ migration() {
     lxc snapshot cccp
 
     # Test container only copies when zfs.clone_copy is set to false.
-    lxc copy cccp udssr --container-only
+    lxc copy cccp udssr --instance-only
     [ "$(lxc info udssr | grep -c snap)" -eq 0 ]
     lxc delete udssr
 
@@ -251,7 +251,7 @@ migration() {
 
   # Remove the testfile from c1 and refresh again
   lxc_remote file delete l1:c1/root/testfile1
-  lxc_remote copy l1:c1 l2:c2 --refresh --container-only
+  lxc_remote copy l1:c1 l2:c2 --refresh --instance-only
   lxc_remote start l2:c2
   ! lxc_remote file pull l2:c2/root/testfile1 . || false
   lxc_remote stop -f l2:c2


More information about the lxc-devel mailing list