[lxc-devel] [lxd/master] lxc/remote: Translatable string tweaks

stgraber on Github lxc-bot at linuxcontainers.org
Fri Sep 6 06:10:26 UTC 2019


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190905/6a67a13b/attachment-0001.bin>
-------------- next part --------------
From 99f9616e083c57dccb674e59d1aa14617225e62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 6 Sep 2019 02:00:42 -0400
Subject: [PATCH 1/2] lxc/remote: Trailing space in translatable string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/remote.go b/lxc/remote.go
index 807cccd3fa..62dbf0ff63 100644
--- a/lxc/remote.go
+++ b/lxc/remote.go
@@ -360,7 +360,7 @@ func (c *cmdRemoteAdd) Run(cmd *cobra.Command, args []string) error {
 	if c.flagAuthType == "tls" {
 		// Prompt for trust password
 		if c.flagPassword == "" {
-			fmt.Printf(i18n.G("Admin password for %s: "), server)
+			fmt.Printf(i18n.G("Admin password for %s:")+" ", server)
 			pwd, err := terminal.ReadPassword(0)
 			if err != nil {
 				/* We got an error, maybe this isn't a terminal, let's try to
@@ -399,7 +399,7 @@ func (c *cmdRemoteAdd) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	if c.flagAuthType == "tls" {
-		fmt.Println(i18n.G("Client certificate stored at server: "), server)
+		fmt.Println(i18n.G("Client certificate stored at server:")+" ", server)
 	}
 
 	return conf.SaveConfig(c.global.confPath)

From bf31bd5497d9ff001a8e8b37c6214cf284005860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 6 Sep 2019 02:09:43 -0400
Subject: [PATCH 2/2] i18n: Update translation templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/po/bg.po b/po/bg.po
index efb4155173..57256ff447 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: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/de.po b/po/de.po
index 347e836508..c38b148d5d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: 2018-11-30 03:10+0000\n"
 "Last-Translator: ssantos <ssantos at web.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -298,7 +298,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (%d mehr)"
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s ist kein Verzeichnis"
@@ -308,7 +308,7 @@ msgstr "%s ist kein Verzeichnis"
 msgid "%v (interrupt two more times to force)"
 msgstr "%v (zwei weitere Male unterbrechen, um zu erzwingen)"
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -417,8 +417,8 @@ msgid "Address: %s"
 msgstr "Profil %s erstellt\n"
 
 #: lxc/remote.go:363
-#, c-format
-msgid "Admin password for %s: "
+#, fuzzy, c-format
+msgid "Admin password for %s:"
 msgstr "Administrator Passwort für %s: "
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -616,7 +616,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -674,7 +674,8 @@ msgid "Certificate fingerprint: %s"
 msgstr "Fingerabdruck des Zertifikats: % x\n"
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+#, fuzzy
+msgid "Client certificate stored at server:"
 msgstr "Gespeichertes Nutzerzertifikat auf dem Server: "
 
 #: lxc/version.go:37
@@ -850,7 +851,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -961,7 +962,7 @@ msgstr "Anhalten des Containers fehlgeschlagen!"
 msgid "Delete containers and snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -1010,8 +1011,8 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr "ABLAUFDATUM"
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1170,7 +1171,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 #, fuzzy
 msgid "Edit files in containers"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -1332,7 +1333,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1649,7 +1650,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr "ungültiges Argument %s"
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, fuzzy, c-format
 msgid "Invalid path %s"
 msgstr "Ungültiges Ziel %s"
@@ -1659,12 +1660,12 @@ msgstr "Ungültiges Ziel %s"
 msgid "Invalid protocol: %s"
 msgstr "Ungültiges Ziel %s"
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr "Ungültige Quelle %s"
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr "Ungültiges Ziel %s"
@@ -1988,7 +1989,7 @@ msgstr "Anhalten des Containers fehlgeschlagen!"
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
 msgid "Manage files in containers"
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -2161,7 +2162,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -2191,7 +2192,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 "Mehr als eine Datei herunterzuladen, aber das Ziel ist kein Verzeichnis"
@@ -2574,22 +2575,22 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Publishing container: %s"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 #, fuzzy
 msgid "Pull files from containers"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 #, fuzzy
 msgid "Push files into containers"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2599,7 +2600,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2951,15 +2952,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr "Setzt die gid der Datei beim Übertragen"
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr "Setzt die Dateiberechtigungen beim Übertragen"
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr "Setzt die uid der Datei beim Übertragen"
 
@@ -3408,7 +3409,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3418,7 +3419,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, fuzzy, c-format
 msgid "Unknown file type '%s'"
 msgstr "Unbekannter Befehl %s für Abbild"
@@ -3481,7 +3482,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3681,7 +3682,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 #, fuzzy
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
@@ -3780,7 +3781,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3858,7 +3859,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -4031,14 +4032,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -4280,7 +4281,7 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 #, fuzzy
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
@@ -4291,7 +4292,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 #, fuzzy
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
diff --git a/po/el.po b/po/el.po
index 8708c7695c..591f2af51f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-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/"
@@ -173,7 +173,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -183,7 +183,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -291,7 +291,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -476,7 +476,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -501,7 +501,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -530,7 +530,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -697,7 +697,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -797,7 +797,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -844,8 +844,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -979,7 +979,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -997,7 +997,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1150,7 +1150,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1457,7 +1457,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1467,12 +1467,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1764,7 +1764,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1926,7 +1926,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1956,7 +1956,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2326,20 +2326,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2682,15 +2682,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3131,7 +3131,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3191,7 +3191,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3380,7 +3380,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3458,7 +3458,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3522,7 +3522,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3682,14 +3682,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3915,13 +3915,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/es.po b/po/es.po
index c405958508..7789ac80c0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: 2019-06-13 16:56+0000\n"
 "Last-Translator: Alonso José Lara Plana <alonso.lara.plana at gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -245,7 +245,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (%d más)"
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s no es un directorio"
@@ -255,7 +255,7 @@ msgstr "%s no es un directorio"
 msgid "%v (interrupt two more times to force)"
 msgstr "%v (interrumpe dos o más tiempos a la fuerza)"
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, fuzzy, c-format
 msgid "'%s' isn't a supported file type"
 msgstr "%s no es un tipo de archivo soportado."
@@ -363,8 +363,8 @@ msgid "Address: %s"
 msgstr "Expira: %s"
 
 #: lxc/remote.go:363
-#, c-format
-msgid "Admin password for %s: "
+#, fuzzy, c-format
+msgid "Admin password for %s:"
 msgstr "Contraseña admin para %s:"
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -549,7 +549,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr "No se puede jalar un directorio sin - recursivo"
 
@@ -575,7 +575,7 @@ msgstr "No se puede especificar un remote diferente para renombrar."
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -604,7 +604,8 @@ msgid "Certificate fingerprint: %s"
 msgstr "Certificado de la huella digital: %s"
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+#, fuzzy
+msgid "Client certificate stored at server:"
 msgstr "Certificado del cliente almacenado en el servidor:"
 
 #: lxc/version.go:37
@@ -773,7 +774,7 @@ msgstr "Creando el contenedor"
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -874,7 +875,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -921,8 +922,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1055,7 +1056,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr "FECHA DE EXPIRACIÓN"
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1073,7 +1074,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1228,7 +1229,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1536,7 +1537,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1546,12 +1547,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1844,7 +1845,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -2006,7 +2007,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 #, fuzzy
 msgid "Missing target directory"
 msgstr "%s no es un directorio"
@@ -2037,7 +2038,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2406,20 +2407,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2429,7 +2430,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2762,15 +2763,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3201,7 +3202,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3211,7 +3212,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3271,7 +3272,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3461,7 +3462,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3539,7 +3540,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3604,7 +3605,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3764,14 +3765,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3997,13 +3998,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/fa.po b/po/fa.po
index 1cff62b4a3..ff6e3012a2 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/fi.po b/po/fi.po
index 809a2309e0..343cc7a08f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/fr.po b/po/fr.po
index 56c9ca1a77..d5c39cddae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-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/"
@@ -288,7 +288,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (%d de plus)"
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s n'est pas un répertoire"
@@ -298,7 +298,7 @@ msgstr "%s n'est pas un répertoire"
 msgid "%v (interrupt two more times to force)"
 msgstr "%v (interrompre encore deux fois pour forcer)"
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, fuzzy, c-format
 msgid "'%s' isn't a supported file type"
 msgstr "'%s' n'est pas un format de fichier pris en charge."
@@ -409,8 +409,8 @@ msgid "Address: %s"
 msgstr "Expire : %s"
 
 #: lxc/remote.go:363
-#, c-format
-msgid "Admin password for %s: "
+#, fuzzy, c-format
+msgid "Admin password for %s:"
 msgstr "Mot de passe administrateur pour %s : "
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -598,7 +598,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 #, fuzzy
 msgid "Can't pull a directory without --recursive"
 msgstr "impossible de récupérer un répertoire sans --recursive"
@@ -625,7 +625,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 #, fuzzy
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr "impossible de spécifier uid/gid/mode en mode récursif"
@@ -656,7 +656,8 @@ msgid "Certificate fingerprint: %s"
 msgstr "Empreinte du certificat : %s"
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+#, fuzzy
+msgid "Client certificate stored at server:"
 msgstr "Certificat client enregistré sur le serveur : "
 
 #: lxc/version.go:37
@@ -836,7 +837,7 @@ msgstr "Création du conteneur"
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr "Créer tous répertoires nécessaires"
 
@@ -962,7 +963,7 @@ msgstr "L'arrêt du conteneur a échoué !"
 msgid "Delete containers and snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -1012,8 +1013,8 @@ msgstr "Copie de l'image : %s"
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1149,7 +1150,7 @@ msgstr "ÉPHÉMÈRE"
 msgid "EXPIRY DATE"
 msgstr "DATE D'EXPIRATION"
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1168,7 +1169,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 #, fuzzy
 msgid "Edit files in containers"
 msgstr "Création du conteneur"
@@ -1338,7 +1339,7 @@ msgstr "Profil à appliquer au nouveau conteneur"
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1662,7 +1663,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr "nombre d'arguments incorrect pour la sous-comande"
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, fuzzy, c-format
 msgid "Invalid path %s"
 msgstr "Cible invalide %s"
@@ -1672,12 +1673,12 @@ msgstr "Cible invalide %s"
 msgid "Invalid protocol: %s"
 msgstr "Cible invalide %s"
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr "Source invalide %s"
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr "Cible invalide %s"
@@ -2036,7 +2037,7 @@ msgstr "L'arrêt du conteneur a échoué !"
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
 msgid "Manage files in containers"
 msgstr "Transfert de l'image : %s"
@@ -2212,7 +2213,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr "Copie de l'image : %s"
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 #, fuzzy
 msgid "Missing target directory"
 msgstr "%s n'est pas un répertoire"
@@ -2244,7 +2245,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr "Plus d'un périphérique correspond, spécifier le nom du périphérique."
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 "Plusieurs fichiers à télécharger, mais la destination n'est pas un dossier"
@@ -2632,22 +2633,22 @@ msgstr "Création du conteneur"
 msgid "Publishing container: %s"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 #, fuzzy
 msgid "Pull files from containers"
 msgstr "Création du conteneur"
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 #, fuzzy
 msgid "Push files into containers"
 msgstr "Création du conteneur"
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2657,7 +2658,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 #, fuzzy
 msgid "Recursively transfer files"
 msgstr "Pousser ou récupérer des fichiers récursivement"
@@ -3015,15 +3016,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr "Définir le gid du fichier lors de l'envoi"
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr "Définir les permissions du fichier lors de l'envoi"
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr "Définir l'uid du fichier lors de l'envoi"
 
@@ -3484,7 +3485,7 @@ msgstr "UTILISÉ PAR"
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3494,7 +3495,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3563,7 +3564,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr "L'utilisateur a annulé l'opération de suppression."
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3760,7 +3761,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 #, fuzzy
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
@@ -3862,7 +3863,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3946,7 +3947,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -4123,14 +4124,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -4398,7 +4399,7 @@ msgstr ""
 "lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
 "alias=ALIAS...] [prop-key=prop-value...]"
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 #, fuzzy
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
@@ -4412,7 +4413,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 #, fuzzy
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
diff --git a/po/hi.po b/po/hi.po
index 4332b61f01..517abd2208 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/id.po b/po/id.po
index 1de5eee5d4..63fa2b5c6a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/it.po b/po/it.po
index 848e166b48..1e5c52cabc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: 2017-08-18 14:22+0000\n"
 "Last-Translator: Alberto Donato <alberto.donato at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -210,7 +210,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (altri %d)"
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr "%v (interrompi altre due volte per forzare)"
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, fuzzy, c-format
 msgid "'%s' isn't a supported file type"
 msgstr "'%s' non è un tipo di file supportato."
@@ -328,8 +328,8 @@ msgid "Address: %s"
 msgstr ""
 
 #: lxc/remote.go:363
-#, c-format
-msgid "Admin password for %s: "
+#, fuzzy, c-format
+msgid "Admin password for %s:"
 msgstr "Password amministratore per %s: "
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -514,7 +514,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr "Impossibile effettuare il pull di una directory senza --recursive"
 
@@ -539,7 +539,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -568,7 +568,8 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+#, fuzzy
+msgid "Client certificate stored at server:"
 msgstr "Certificato del client salvato dal server: "
 
 #: lxc/version.go:37
@@ -736,7 +737,7 @@ msgstr "Creazione del container in corso"
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -838,7 +839,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -885,8 +886,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1019,7 +1020,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr "DATA DI SCADENZA"
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1037,7 +1038,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1192,7 +1193,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1503,7 +1504,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr "numero errato di argomenti del sottocomando"
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1513,12 +1514,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr "Proprietà errata: %s"
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1813,7 +1814,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 #, fuzzy
 msgid "Manage files in containers"
 msgstr "Creazione del container in corso"
@@ -1976,7 +1977,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -2006,7 +2007,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2376,20 +2377,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr "Creazione del container in corso"
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2399,7 +2400,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2733,15 +2734,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3175,7 +3176,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3185,7 +3186,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3246,7 +3247,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3437,7 +3438,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3515,7 +3516,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3580,7 +3581,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3740,14 +3741,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3973,13 +3974,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/ja.po b/po/ja.po
index 780cbe5a04..4021fcd276 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: 2019-05-18 08:49+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -173,7 +173,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (他%d個)"
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s はディレクトリではありません"
@@ -184,7 +184,7 @@ msgid "%v (interrupt two more times to force)"
 msgstr ""
 "%v (強制的に中断したい場合はあと2回Ctrl-Cを入力/SIGINTを送出してください)"
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr "'%s' はサポートされないタイプのファイルです"
@@ -293,8 +293,8 @@ msgid "Address: %s"
 msgstr "MAC アドレス: %s"
 
 #: lxc/remote.go:363
-#, c-format
-msgid "Admin password for %s: "
+#, fuzzy, c-format
+msgid "Admin password for %s:"
 msgstr "%s の管理者パスワード: "
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -484,7 +484,7 @@ msgstr "ローカル上のリネームでは、設定やプロファイルの上
 msgid "Can't provide a name for the target image"
 msgstr "ターゲットイメージの名前を取得できません"
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 "ディレクトリを pull する場合は --recursive オプションを使用してください"
@@ -511,7 +511,7 @@ msgstr "リネームの場合は異なるリモートを指定できません"
 msgid "Can't specify column L when not clustered"
 msgstr "クラスタでない場合はカラムとして L は指定できません"
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr "再帰 (recursive) モードでは uid/gid/mode を指定できません"
 
@@ -540,7 +540,8 @@ msgid "Certificate fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+#, fuzzy
+msgid "Client certificate stored at server:"
 msgstr "クライアント証明書がサーバに格納されました: "
 
 #: lxc/version.go:37
@@ -717,7 +718,7 @@ msgstr "コンテナを作成中"
 msgid "Create and start containers from images"
 msgstr "イメージからコンテナを作成し、起動します"
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr "必要なディレクトリをすべて作成します"
 
@@ -821,7 +822,7 @@ msgstr "コンテナのファイルテンプレートを削除します"
 msgid "Delete containers and snapshots"
 msgstr "コンテナとスナップショットを削除します"
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr "コンテナ内のファイルを削除します"
 
@@ -868,8 +869,8 @@ msgstr "ストレージボリュームを削除します"
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1006,7 +1007,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1024,7 +1025,7 @@ msgstr "コンテナのメタデータファイルを編集します"
 msgid "Edit container or server configurations as YAML"
 msgstr "コンテナもしくはサーバの設定をYAMLファイルで編集します"
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr "コンテナ内のファイルを編集します"
 
@@ -1202,7 +1203,7 @@ msgstr "新しいコンテナ名が取得できません"
 msgid "Failed to remove alias %s"
 msgstr "エイリアス %s の削除に失敗しました"
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr "パス %s にアクセスできませんでした: %s"
@@ -1518,7 +1519,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr "引数の数が不正です"
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr "不正なパス %s"
@@ -1528,12 +1529,12 @@ msgstr "不正なパス %s"
 msgid "Invalid protocol: %s"
 msgstr "不正なプロトコル: %s"
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr "不正なソース %s"
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr "不正な送り先 %s"
@@ -1910,7 +1911,7 @@ msgstr "コンテナのファイルテンプレートを管理します"
 msgid "Manage container metadata files"
 msgstr "コンテナのメタデータファイルを管理します"
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr "コンテナ内のファイルを管理します"
 
@@ -2088,7 +2089,7 @@ msgstr "コピー元のプロファイル名を指定する必要があります
 msgid "Missing source volume name"
 msgstr "コピー元のボリューム名を指定する必要があります"
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr "コピー先のディレクトリを指定する必要があります"
 
@@ -2121,7 +2122,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr "複数のデバイスとマッチします。デバイス名を指定してください"
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 "ダウンロード対象のファイルが複数ありますが、コピー先がディレクトリではありま"
@@ -2493,20 +2494,20 @@ msgstr "コンテナをイメージとして出力します"
 msgid "Publishing container: %s"
 msgstr "コンテナの更新中: %s"
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr "コンテナからファイルを取得します"
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr "ファイル %s を %s から取得します: %%s"
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr "コンテナ内にファイルをコピーします"
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr "ファイル %s をコンテナ %s 内にコピーします: %%s"
@@ -2516,7 +2517,7 @@ msgstr "ファイル %s をコンテナ %s 内にコピーします: %%s"
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr "再帰的にファイルを転送します"
 
@@ -2856,15 +2857,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr "リモートの URL を設定します"
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr "プッシュ時にファイルのgidを設定します"
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr "プッシュ時にファイルのパーミションを設定します"
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr "プッシュ時にファイルのuidを設定します"
 
@@ -3308,7 +3309,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr "テンポラリファイルを作成できません: %v"
@@ -3318,7 +3319,7 @@ msgstr "テンポラリファイルを作成できません: %v"
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr "未知のカラム名の短縮形です '%c' ('%s' 中)"
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr "未知のファイルタイプ '%s'"
@@ -3380,7 +3381,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr "ユーザが削除操作を中断しました"
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3572,7 +3573,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
@@ -3653,7 +3654,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3720,7 +3721,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3903,7 +3904,7 @@ msgstr ""
 "lxc export u1 backup0.tar.gz\n"
 "    u1 コンテナのバックアップ tarball をダウンロードします。"
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
@@ -3913,7 +3914,7 @@ msgstr ""
 "   コンテナの /etc/hosts ファイルを取得し、カレントディレクトリにコピーしま"
 "す。"
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -4225,7 +4226,7 @@ msgstr ""
 "publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] "
 "[key=value...]"
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
@@ -4233,7 +4234,7 @@ msgstr ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/ko.po b/po/ko.po
index be672fc860..018306fd42 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/lxd.pot b/po/lxd.pot
index 017d13960b..fb7465cbd7 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2019-09-05 12:51-0400\n"
+        "POT-Creation-Date: 2019-09-06 02:09-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"
@@ -162,7 +162,7 @@ msgstr  ""
 msgid   "%s (%d more)"
 msgstr  ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid   "%s is not a directory"
 msgstr  ""
@@ -172,7 +172,7 @@ msgstr  ""
 msgid   "%v (interrupt two more times to force)"
 msgstr  ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid   "'%s' isn't a supported file type"
 msgstr  ""
@@ -276,7 +276,7 @@ msgstr  ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid   "Admin password for %s: "
+msgid   "Admin password for %s:"
 msgstr  ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -458,7 +458,7 @@ msgstr  ""
 msgid   "Can't provide a name for the target image"
 msgstr  ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid   "Can't pull a directory without --recursive"
 msgstr  ""
 
@@ -483,7 +483,7 @@ msgstr  ""
 msgid   "Can't specify column L when not clustered"
 msgstr  ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid   "Can't supply uid/gid/mode in recursive mode"
 msgstr  ""
 
@@ -512,7 +512,7 @@ msgid   "Certificate fingerprint: %s"
 msgstr  ""
 
 #: lxc/remote.go:402
-msgid   "Client certificate stored at server: "
+msgid   "Client certificate stored at server:"
 msgstr  ""
 
 #: lxc/version.go:37
@@ -665,7 +665,7 @@ msgstr  ""
 msgid   "Create and start containers from images"
 msgstr  ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid   "Create any directories necessary"
 msgstr  ""
 
@@ -763,7 +763,7 @@ msgstr  ""
 msgid   "Delete containers and snapshots"
 msgstr  ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid   "Delete files in containers"
 msgstr  ""
 
@@ -795,7 +795,7 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:21 lxc/alias.go:53 lxc/alias.go:99 lxc/alias.go:143 lxc/alias.go:194 lxc/cluster.go:28 lxc/cluster.go:67 lxc/cluster.go:145 lxc/cluster.go:195 lxc/cluster.go:245 lxc/cluster.go:330 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:182 lxc/config_device.go:255 lxc/config_device.go:321 lxc/config_device.go:410 lxc/config_device.go:500 lxc/config_device.go:599 lxc/config_device.go:667 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:28 lxc/config_template.go:65 lxc/config_template.go:108 lxc/config_template.go:150 lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32 lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31 lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219 lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789 lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24 lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149 lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39 lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107 lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375 lxc/network.go:460 lxc/network.go:545 lxc/network.go:668 lxc/network.go:726 lxc/network.go:806 lxc/network.go:891 lxc/network.go:960 lxc/network.go:1010 lxc/network.go:1080 lxc/network.go:1142 lxc/operation.go:23 lxc/operation.go:52 lxc/operation.go:101 lxc/operation.go:180 lxc/profile.go:28 lxc/profile.go:100 lxc/profile.go:163 lxc/profile.go:243 lxc/profile.go:299 lxc/profile.go:353 lxc/profile.go:403 lxc/profile.go:527 lxc/profile.go:576 lxc/profile.go:635 lxc/profile.go:711 lxc/profile.go:761 lxc/profile.go:820 lxc/profile.go:874 lxc/project.go:28 lxc/project.go:85 lxc/project.go:150 lxc/project.go:213 lxc/project.go:333 lxc/project.go:383 lxc/project.go:468 lxc/project.go:523 lxc/project.go:583 lxc/project.go:612 lxc/project.go:665 lxc/publish.go:35 lxc/query.go:30 lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:418 lxc/remote.go:454 lxc/remote.go:534 lxc/remote.go:596 lxc/remote.go:646 lxc/remote.go:684 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:32 lxc/storage.go:88 lxc/storage.go:162 lxc/storage.go:212 lxc/storage.go:332 lxc/storage.go:387 lxc/storage.go:507 lxc/storage.go:581 lxc/storage.go:650 lxc/storage.go:734 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1276 lxc/storage_volume.go:1352 lxc/storage_volume.go:1451 lxc/storage_volume.go:1482 lxc/storage_volume.go:1553 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:21 lxc/alias.go:53 lxc/alias.go:99 lxc/alias.go:143 lxc/alias.go:194 lxc/cluster.go:28 lxc/cluster.go:67 lxc/cluster.go:145 lxc/cluster.go:195 lxc/cluster.go:245 lxc/cluster.go:330 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:182 lxc/config_device.go:255 lxc/config_device.go:321 lxc/config_device.go:410 lxc/config_device.go:500 lxc/config_device.go:599 lxc/config_device.go:667 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:28 lxc/config_template.go:65 lxc/config_template.go:108 lxc/config_template.go:150 lxc/config_template.go:236 lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57 lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32 lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789 lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24 lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149 lxc/image_alias.go:246 lxc/import.go:28 lxc/info.go:32 lxc/init.go:39 lxc/launch.go:23 lxc/list.go:43 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:31 lxc/network.go:107 lxc/network.go:180 lxc/network.go:253 lxc/network.go:325 lxc/network.go:375 lxc/network.go:460 lxc/network.go:545 lxc/network.go:668 lxc/network.go:726 lxc/network.go:806 lxc/network.go:891 lxc/network.go:960 lxc/network.go:1010 lxc/network.go:1080 lxc/network.go:1142 lxc/operation.go:23 lxc/operation.go:52 lxc/operation.go:101 lxc/operation.go:180 lxc/profile.go:28 lxc/profile.go:100 lxc/profile.go:163 lxc/profile.go:243 lxc/profile.go:299 lxc/profile.go:353 lxc/profile.go:403 lxc/profile.go:527 lxc/profile.go:576 lxc/profile.go:635 lxc/profile.go:711 lxc/profile.go:761 lxc/profile.go:820 lxc/profile.go:874 lxc/project.go:28 lxc/project.go:85 lxc/project.go:150 lxc/project.go:213 lxc/project.go:333 lxc/project.go:383 lxc/project.go:468 lxc/project.go:523 lxc/project.go:583 lxc/project.go:612 lxc/project.go:665 lxc/publish.go:35 lxc/query.go:30 lxc/remote.go:33 lxc/remote.go:84 lxc/remote.go:418 lxc/remote.go:454 lxc/remote.go:534 lxc/remote.go:596 lxc/remote.go:646 lxc/remote.go:684 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:32 lxc/storage.go:88 lxc/storage.go:162 lxc/storage.go:212 lxc/storage.go:332 lxc/storage.go:387 lxc/storage.go:507 lxc/storage.go:581 lxc/storage.go:650 lxc/storage.go:734 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1276 lxc/storage_volume.go:1352 lxc/storage_volume.go:1451 lxc/storage_volume.go:1482 lxc/storage_volume.go:1553 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -894,7 +894,7 @@ msgstr  ""
 msgid   "EXPIRY DATE"
 msgstr  ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid   "Early server side processing of file tranfer requests cannot be canceled (interrupt two more times to force)"
 msgstr  ""
 
@@ -910,7 +910,7 @@ msgstr  ""
 msgid   "Edit container or server configurations as YAML"
 msgstr  ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid   "Edit files in containers"
 msgstr  ""
 
@@ -1055,7 +1055,7 @@ msgstr  ""
 msgid   "Failed to remove alias %s"
 msgstr  ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid   "Failed to walk path for %s: %s"
 msgstr  ""
@@ -1349,7 +1349,7 @@ msgstr  ""
 msgid   "Invalid number of arguments"
 msgstr  ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid   "Invalid path %s"
 msgstr  ""
@@ -1359,12 +1359,12 @@ msgstr  ""
 msgid   "Invalid protocol: %s"
 msgstr  ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid   "Invalid source %s"
 msgstr  ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid   "Invalid target %s"
 msgstr  ""
@@ -1649,7 +1649,7 @@ msgstr  ""
 msgid   "Manage container metadata files"
 msgstr  ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid   "Manage files in containers"
 msgstr  ""
 
@@ -1788,7 +1788,7 @@ msgstr  ""
 msgid   "Missing source volume name"
 msgstr  ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid   "Missing target directory"
 msgstr  ""
 
@@ -1816,7 +1816,7 @@ msgstr  ""
 msgid   "More than one device matches, specify the device name"
 msgstr  ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid   "More than one file to download, but target is not a directory"
 msgstr  ""
 
@@ -2180,20 +2180,20 @@ msgstr  ""
 msgid   "Publishing container: %s"
 msgstr  ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid   "Pull files from containers"
 msgstr  ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid   "Pulling %s from %s: %%s"
 msgstr  ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid   "Push files into containers"
 msgstr  ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid   "Pushing %s to %s: %%s"
 msgstr  ""
@@ -2203,7 +2203,7 @@ msgstr  ""
 msgid   "Read-Only: %v"
 msgstr  ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid   "Recursively transfer files"
 msgstr  ""
 
@@ -2517,15 +2517,15 @@ msgstr  ""
 msgid   "Set the URL for the remote"
 msgstr  ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid   "Set the file's gid on push"
 msgstr  ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid   "Set the file's perms on push"
 msgstr  ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid   "Set the file's uid on push"
 msgstr  ""
 
@@ -2945,7 +2945,7 @@ msgstr  ""
 msgid   "UUID: %v"
 msgstr  ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid   "Unable to create a temporary file: %v"
 msgstr  ""
@@ -2955,7 +2955,7 @@ msgstr  ""
 msgid   "Unknown column shorthand char '%c' in '%s'"
 msgstr  ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid   "Unknown file type '%s'"
 msgstr  ""
@@ -3014,7 +3014,7 @@ msgstr  ""
 msgid   "User aborted delete operation"
 msgstr  ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid   "User signaled us three times, exiting. The remote operation will keep running"
 msgstr  ""
 
@@ -3195,7 +3195,7 @@ msgstr  ""
 msgid   "delete [<remote>:]<container> <template>"
 msgstr  ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid   "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr  ""
 
@@ -3271,7 +3271,7 @@ msgstr  ""
 msgid   "edit [<remote>:]<container> <template>"
 msgstr  ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid   "edit [<remote>:]<container>/<path>"
 msgstr  ""
 
@@ -3333,7 +3333,7 @@ msgstr  ""
 msgid   "export [<remote>:]<image> [<target>]"
 msgstr  ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid   "file"
 msgstr  ""
 
@@ -3482,12 +3482,12 @@ msgid   "lxc export u1 backup0.tar.gz\n"
         "    Download a backup tarball of the u1 container."
 msgstr  ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid   "lxc file pull foo/etc/hosts .\n"
         "   To pull /etc/hosts from the container and write it to the current directory."
 msgstr  ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid   "lxc file push /etc/hosts foo/etc/hosts\n"
         "   To push /etc/hosts into the container \"foo\"."
 msgstr  ""
@@ -3684,11 +3684,11 @@ msgstr  ""
 msgid   "publish [<remote>:]<container>[/<snapshot>] [<remote>:] [flags] [key=value...]"
 msgstr  ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid   "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] <target path>"
 msgstr  ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid   "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index d456b8777c..ddfefc3dde 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/nl.po b/po/nl.po
index 98107df475..52fb11098e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: 2019-02-26 09:18+0000\n"
 "Last-Translator: Heimen Stoffels <vistausss at outlook.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (en nog %d)"
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -229,7 +229,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -521,7 +521,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -546,7 +546,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -742,7 +742,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -889,8 +889,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1021,7 +1021,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1039,7 +1039,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1192,7 +1192,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1499,7 +1499,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1509,12 +1509,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1806,7 +1806,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1966,7 +1966,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1996,7 +1996,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2365,20 +2365,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2388,7 +2388,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2721,15 +2721,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3160,7 +3160,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3170,7 +3170,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3230,7 +3230,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3419,7 +3419,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3497,7 +3497,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3561,7 +3561,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3721,14 +3721,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3954,13 +3954,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/pa.po b/po/pa.po
index 39422ec321..283e1cf617 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/pl.po b/po/pl.po
index 8723d0ca07..1c558445a9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-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/"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -229,7 +229,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -521,7 +521,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -546,7 +546,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -742,7 +742,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -889,8 +889,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1021,7 +1021,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1039,7 +1039,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1192,7 +1192,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1499,7 +1499,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1509,12 +1509,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1806,7 +1806,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1966,7 +1966,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1996,7 +1996,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2365,20 +2365,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2388,7 +2388,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2721,15 +2721,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3160,7 +3160,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3170,7 +3170,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3230,7 +3230,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3419,7 +3419,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3497,7 +3497,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3561,7 +3561,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3721,14 +3721,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3954,13 +3954,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d68e3dfbf6..242209107c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: 2019-08-08 18:08+0000\n"
 "Last-Translator: Tiago A. Reul <tiago at reul.space>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -289,7 +289,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr "%s (%d mais)"
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s não é um diretório"
@@ -299,7 +299,7 @@ msgstr "%s não é um diretório"
 msgid "%v (interrupt two more times to force)"
 msgstr "%v (interrompa mais duas vezes para forçar)"
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr "'%s' não é um tipo de arquivo suportado"
@@ -408,8 +408,8 @@ msgid "Address: %s"
 msgstr ""
 
 #: lxc/remote.go:363
-#, c-format
-msgid "Admin password for %s: "
+#, fuzzy, c-format
+msgid "Admin password for %s:"
 msgstr "Senha de administrador para %s: "
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -594,7 +594,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr "Não pode fornecer um nome para a imagem de destino"
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr "Não pode pegar um diretório sem --recursive"
 
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr "Não pode especificar a coluna L, quando não em cluster"
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr "Não é possível fornecer o uid/gid/modo no modo recursivo"
 
@@ -648,7 +648,8 @@ msgid "Certificate fingerprint: %s"
 msgstr "Certificado fingerprint: %s"
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+#, fuzzy
+msgid "Client certificate stored at server:"
 msgstr "Certificado do cliente armazenado no servidor:"
 
 #: lxc/version.go:37
@@ -820,7 +821,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -924,7 +925,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -971,8 +972,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1105,7 +1106,7 @@ msgstr "EFÊMERO"
 msgid "EXPIRY DATE"
 msgstr "DATA DE VALIDADE"
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1123,7 +1124,7 @@ msgstr "Editar arquivos de metadados do container"
 msgid "Edit container or server configurations as YAML"
 msgstr "Editar configurações do container ou do servidor como YAML"
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr "Editar arquivos no container"
 
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1585,7 +1586,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1595,12 +1596,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1892,7 +1893,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -2052,7 +2053,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -2082,7 +2083,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2451,20 +2452,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr "Editar arquivos no container"
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2474,7 +2475,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2808,15 +2809,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3247,7 +3248,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3257,7 +3258,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3318,7 +3319,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3507,7 +3508,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3585,7 +3586,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3649,7 +3650,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3809,14 +3810,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -4042,13 +4043,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/ru.po b/po/ru.po
index aadb812974..6e7964718f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-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/"
@@ -280,7 +280,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -290,7 +290,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -399,8 +399,8 @@ msgid "Address: %s"
 msgstr ""
 
 #: lxc/remote.go:363
-#, c-format
-msgid "Admin password for %s: "
+#, fuzzy, c-format
+msgid "Admin password for %s:"
 msgstr "Пароль администратора для %s: "
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -586,7 +586,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -611,7 +611,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -640,7 +640,8 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+#, fuzzy
+msgid "Client certificate stored at server:"
 msgstr "Сертификат клиента хранится на сервере: "
 
 #: lxc/version.go:37
@@ -809,7 +810,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -916,7 +917,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Delete containers and snapshots"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -964,8 +965,8 @@ msgstr "Копирование образа: %s"
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -1099,7 +1100,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -1118,7 +1119,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1274,7 +1275,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1584,7 +1585,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1594,12 +1595,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1895,7 +1896,7 @@ msgstr "Невозможно добавить имя контейнера в с
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -2062,7 +2063,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr "Копирование образа: %s"
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -2092,7 +2093,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2464,20 +2465,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2487,7 +2488,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2826,15 +2827,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3270,7 +3271,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3280,7 +3281,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3340,7 +3341,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3530,7 +3531,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 #, fuzzy
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
@@ -3628,7 +3629,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3704,7 +3705,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3876,14 +3877,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -4117,7 +4118,7 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 #, fuzzy
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
@@ -4127,7 +4128,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 #, fuzzy
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
diff --git a/po/sr.po b/po/sr.po
index e652789355..22770a4391 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/sv.po b/po/sv.po
index 055ad9669a..1c6fa83ff7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/te.po b/po/te.po
index b776e0156c..e331a5164d 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: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/tr.po b/po/tr.po
index 4f843bf82a..9bd72a79eb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/uk.po b/po/uk.po
index ed6333d39a..d487bed4d6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -840,8 +840,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -972,7 +972,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1450,7 +1450,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1460,12 +1460,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2316,20 +2316,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2672,15 +2672,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3370,7 +3370,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3448,7 +3448,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3672,14 +3672,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3905,13 +3905,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index c4ecc74bf7..a48cb4f486 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2019-09-05 12:51-0400\n"
+"POT-Creation-Date: 2019-09-06 02:09-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/"
@@ -173,7 +173,7 @@ msgstr ""
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/file.go:846
+#: lxc/file.go:844
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s 不是一个目录"
@@ -183,7 +183,7 @@ msgstr "%s 不是一个目录"
 msgid "%v (interrupt two more times to force)"
 msgstr ""
 
-#: lxc/file.go:740
+#: lxc/file.go:738
 #, c-format
 msgid "'%s' isn't a supported file type"
 msgstr ""
@@ -291,7 +291,7 @@ msgstr ""
 
 #: lxc/remote.go:363
 #, c-format
-msgid "Admin password for %s: "
+msgid "Admin password for %s:"
 msgstr ""
 
 #: lxc/alias.go:76 lxc/alias.go:172
@@ -475,7 +475,7 @@ msgstr ""
 msgid "Can't provide a name for the target image"
 msgstr ""
 
-#: lxc/file.go:303
+#: lxc/file.go:301
 msgid "Can't pull a directory without --recursive"
 msgstr ""
 
@@ -500,7 +500,7 @@ msgstr ""
 msgid "Can't specify column L when not clustered"
 msgstr ""
 
-#: lxc/file.go:483
+#: lxc/file.go:481
 msgid "Can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
@@ -529,7 +529,7 @@ msgid "Certificate fingerprint: %s"
 msgstr ""
 
 #: lxc/remote.go:402
-msgid "Client certificate stored at server: "
+msgid "Client certificate stored at server:"
 msgstr ""
 
 #: lxc/version.go:37
@@ -696,7 +696,7 @@ msgstr ""
 msgid "Create and start containers from images"
 msgstr ""
 
-#: lxc/file.go:225 lxc/file.go:416
+#: lxc/file.go:223 lxc/file.go:414
 msgid "Create any directories necessary"
 msgstr ""
 
@@ -796,7 +796,7 @@ msgstr ""
 msgid "Delete containers and snapshots"
 msgstr ""
 
-#: lxc/file.go:106 lxc/file.go:107
+#: lxc/file.go:104 lxc/file.go:105
 msgid "Delete files in containers"
 msgstr ""
 
@@ -843,8 +843,8 @@ msgstr ""
 #: lxc/config_template.go:295 lxc/config_trust.go:28 lxc/config_trust.go:57
 #: lxc/config_trust.go:115 lxc/config_trust.go:193 lxc/console.go:32
 #: lxc/copy.go:40 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:31
-#: lxc/file.go:74 lxc/file.go:107 lxc/file.go:156 lxc/file.go:219
-#: lxc/file.go:409 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
+#: lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217
+#: lxc/file.go:407 lxc/image.go:38 lxc/image.go:127 lxc/image.go:261
 #: lxc/image.go:312 lxc/image.go:435 lxc/image.go:575 lxc/image.go:789
 #: lxc/image.go:903 lxc/image.go:1191 lxc/image.go:1268 lxc/image_alias.go:24
 #: lxc/image_alias.go:57 lxc/image_alias.go:104 lxc/image_alias.go:149
@@ -975,7 +975,7 @@ msgstr ""
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/file.go:65
+#: lxc/file.go:63
 msgid ""
 "Early server side processing of file tranfer requests cannot be canceled "
 "(interrupt two more times to force)"
@@ -993,7 +993,7 @@ msgstr ""
 msgid "Edit container or server configurations as YAML"
 msgstr ""
 
-#: lxc/file.go:155 lxc/file.go:156
+#: lxc/file.go:153 lxc/file.go:154
 msgid "Edit files in containers"
 msgstr ""
 
@@ -1146,7 +1146,7 @@ msgstr ""
 msgid "Failed to remove alias %s"
 msgstr ""
 
-#: lxc/file.go:735
+#: lxc/file.go:733
 #, c-format
 msgid "Failed to walk path for %s: %s"
 msgstr ""
@@ -1453,7 +1453,7 @@ msgstr ""
 msgid "Invalid number of arguments"
 msgstr ""
 
-#: lxc/file.go:131
+#: lxc/file.go:129
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
@@ -1463,12 +1463,12 @@ msgstr ""
 msgid "Invalid protocol: %s"
 msgstr ""
 
-#: lxc/file.go:277
+#: lxc/file.go:275
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:437
+#: lxc/file.go:435
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "Manage container metadata files"
 msgstr ""
 
-#: lxc/file.go:73 lxc/file.go:74
+#: lxc/file.go:71 lxc/file.go:72
 msgid "Manage files in containers"
 msgstr ""
 
@@ -1920,7 +1920,7 @@ msgstr ""
 msgid "Missing source volume name"
 msgstr ""
 
-#: lxc/file.go:530
+#: lxc/file.go:528
 msgid "Missing target directory"
 msgstr ""
 
@@ -1950,7 +1950,7 @@ msgstr ""
 msgid "More than one device matches, specify the device name"
 msgstr ""
 
-#: lxc/file.go:258
+#: lxc/file.go:256
 msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
@@ -2319,20 +2319,20 @@ msgstr ""
 msgid "Publishing container: %s"
 msgstr ""
 
-#: lxc/file.go:218 lxc/file.go:219
+#: lxc/file.go:216 lxc/file.go:217
 msgid "Pull files from containers"
 msgstr ""
 
-#: lxc/file.go:366 lxc/file.go:689
+#: lxc/file.go:364 lxc/file.go:687
 #, c-format
 msgid "Pulling %s from %s: %%s"
 msgstr ""
 
-#: lxc/file.go:408 lxc/file.go:409
+#: lxc/file.go:406 lxc/file.go:407
 msgid "Push files into containers"
 msgstr ""
 
-#: lxc/file.go:625 lxc/file.go:781
+#: lxc/file.go:623 lxc/file.go:779
 #, c-format
 msgid "Pushing %s to %s: %%s"
 msgstr ""
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Read-Only: %v"
 msgstr ""
 
-#: lxc/file.go:226 lxc/file.go:415
+#: lxc/file.go:224 lxc/file.go:413
 msgid "Recursively transfer files"
 msgstr ""
 
@@ -2675,15 +2675,15 @@ msgstr ""
 msgid "Set the URL for the remote"
 msgstr ""
 
-#: lxc/file.go:418
+#: lxc/file.go:416
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:419
+#: lxc/file.go:417
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:417
+#: lxc/file.go:415
 msgid "Set the file's uid on push"
 msgstr ""
 
@@ -3114,7 +3114,7 @@ msgstr ""
 msgid "UUID: %v"
 msgstr ""
 
-#: lxc/file.go:181
+#: lxc/file.go:179
 #, c-format
 msgid "Unable to create a temporary file: %v"
 msgstr ""
@@ -3124,7 +3124,7 @@ msgstr ""
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
 
-#: lxc/file.go:722
+#: lxc/file.go:720
 #, c-format
 msgid "Unknown file type '%s'"
 msgstr ""
@@ -3184,7 +3184,7 @@ msgstr ""
 msgid "User aborted delete operation"
 msgstr ""
 
-#: lxc/file.go:62 lxc/utils/cancel.go:63
+#: lxc/file.go:60 lxc/utils/cancel.go:63
 msgid ""
 "User signaled us three times, exiting. The remote operation will keep running"
 msgstr ""
@@ -3373,7 +3373,7 @@ msgstr ""
 msgid "delete [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:104
+#: lxc/file.go:102
 msgid "delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]"
 msgstr ""
 
@@ -3451,7 +3451,7 @@ msgstr ""
 msgid "edit [<remote>:]<container> <template>"
 msgstr ""
 
-#: lxc/file.go:154
+#: lxc/file.go:152
 msgid "edit [<remote>:]<container>/<path>"
 msgstr ""
 
@@ -3515,7 +3515,7 @@ msgstr ""
 msgid "export [<remote>:]<image> [<target>]"
 msgstr ""
 
-#: lxc/file.go:72
+#: lxc/file.go:70
 msgid "file"
 msgstr ""
 
@@ -3675,14 +3675,14 @@ msgid ""
 "    Download a backup tarball of the u1 container."
 msgstr ""
 
-#: lxc/file.go:221
+#: lxc/file.go:219
 msgid ""
 "lxc file pull foo/etc/hosts .\n"
 "   To pull /etc/hosts from the container and write it to the current "
 "directory."
 msgstr ""
 
-#: lxc/file.go:411
+#: lxc/file.go:409
 msgid ""
 "lxc file push /etc/hosts foo/etc/hosts\n"
 "   To push /etc/hosts into the container \"foo\"."
@@ -3908,13 +3908,13 @@ msgid ""
 "[key=value...]"
 msgstr ""
 
-#: lxc/file.go:217
+#: lxc/file.go:215
 msgid ""
 "pull [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] "
 "<target path>"
 msgstr ""
 
-#: lxc/file.go:407
+#: lxc/file.go:405
 msgid ""
 "push <source path> [<remote>:]<container>/<path> [[<remote>:]<container>/"
 "<path>...]"


More information about the lxc-devel mailing list