mcst-linux-kernel/patches-2024.06.26/lxd-3.0.0/0013-i18n-Update-translation-templates.patch

From 4c278e6a0230fcf692d23bc97884c5d51b9612f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
Date: Mon, 2 Apr 2018 19:23:14 -0400
Subject: 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@ubuntu.com>
---
 po/de.po      | 160 +++++++++++++++++++++++------------------------
 po/el.po      | 160 +++++++++++++++++++++++------------------------
 po/es.po      | 160 +++++++++++++++++++++++------------------------
 po/fa.po      | 160 +++++++++++++++++++++++------------------------
 po/fi.po      | 160 +++++++++++++++++++++++------------------------
 po/fr.po      | 165 ++++++++++++++++++++++++-------------------------
 po/hi.po      | 160 +++++++++++++++++++++++------------------------
 po/id.po      | 160 +++++++++++++++++++++++------------------------
 po/it.po      | 160 +++++++++++++++++++++++------------------------
 po/ja.po      | 167 ++++++++++++++++++++++++--------------------------
 po/lxd.pot    | 144 ++++++++++++++++++++-----------------------
 po/nb_NO.po   | 160 +++++++++++++++++++++++------------------------
 po/nl.po      | 160 +++++++++++++++++++++++------------------------
 po/pa.po      | 160 +++++++++++++++++++++++------------------------
 po/pl.po      | 160 +++++++++++++++++++++++------------------------
 po/pt_BR.po   | 160 +++++++++++++++++++++++------------------------
 po/ru.po      | 160 +++++++++++++++++++++++------------------------
 po/sr.po      | 160 +++++++++++++++++++++++------------------------
 po/sv.po      | 160 +++++++++++++++++++++++------------------------
 po/tr.po      | 160 +++++++++++++++++++++++------------------------
 po/uk.po      | 160 +++++++++++++++++++++++------------------------
 po/zh.po      | 160 +++++++++++++++++++++++------------------------
 po/zh_Hans.po | 160 +++++++++++++++++++++++------------------------
 23 files changed, 1749 insertions(+), 1927 deletions(-)

diff --git a/po/de.po b/po/de.po
index 136c83ca..48d73453 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: 2017-02-14 17:11+0000\n"
 "Last-Translator: Tim Rose <tim@netlope.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -250,7 +250,7 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -274,15 +274,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -343,12 +343,12 @@ msgstr "entfernte Instanz %s existiert nicht"
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 #, fuzzy
 msgid "Aliases:"
 msgstr "Aliasse:\n"
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, fuzzy, c-format
 msgid "Architecture: %s"
 msgstr "Architektur: %s\n"
@@ -395,7 +395,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr "automatisches Update: %s"
@@ -411,7 +411,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, fuzzy, c-format
 msgid "Bad property: %s"
 msgstr "Ungültige Abbild Eigenschaft: %s\n"
@@ -454,7 +454,7 @@ msgstr "ERSTELLT AM"
 msgid "CREATED AT"
 msgstr "ERSTELLT AM"
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, fuzzy, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -516,18 +516,18 @@ msgstr "Gespeichertes Nutzerzertifikat auf dem Server: "
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -684,7 +684,7 @@ msgstr "Fehlerhafte Profil URL %s"
 msgid "Create storage pools"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -703,7 +703,7 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -776,8 +776,8 @@ msgstr "Kein Zertifikat für diese Verbindung"
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -905,7 +905,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -950,12 +950,12 @@ msgstr ""
 "\n"
 "lxc exec <Container> [--env EDITOR=/usr/bin/vim]... <Befehl>\n"
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -1014,7 +1014,7 @@ msgstr ""
 "Anzeigen von Informationen über entfernte Instanzen wird noch nicht "
 "unterstützt\n"
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, fuzzy, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerabdruck: %s\n"
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -1112,7 +1112,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -1124,7 +1124,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -1133,12 +1133,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, fuzzy, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, fuzzy, c-format
 msgid "Invalid format %q"
 msgstr "Ungültiges Ziel %s"
@@ -1239,7 +1239,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1251,12 +1251,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1350,7 +1350,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1386,11 +1386,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1565,6 +1565,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, fuzzy, c-format
+msgid "Member %s removed"
+msgstr "Gerät %s wurde von %s entfernt\n"
+
+#: lxc/cluster.go:221
+#, fuzzy, c-format
+msgid "Member %s renamed to %s"
+msgstr "Profil %s wurde auf %s angewandt\n"
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1696,10 +1706,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1717,7 +1723,7 @@ msgstr "Profil %s gelöscht\n"
 
 #: lxc/network.go:301
 #, fuzzy, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr "Profil %s erstellt\n"
 
 #: lxc/network.go:906
@@ -1765,20 +1771,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr "kein Wert in %q gefunden\n"
 
-#: lxc/cluster.go:268
-#, fuzzy, c-format
-msgid "Node %s removed"
-msgstr "Gerät %s wurde von %s entfernt\n"
-
-#: lxc/cluster.go:221
-#, fuzzy, c-format
-msgid "Node %s renamed to %s"
-msgstr "Profil %s wurde auf %s angewandt\n"
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1787,7 +1779,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1824,7 +1816,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1927,7 +1919,7 @@ msgstr "Profil %s wurde auf %s angewandt\n"
 msgid "Profiles: %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 #, fuzzy
 msgid "Properties:"
 msgstr "Eigenschaften:\n"
@@ -1936,7 +1928,7 @@ msgstr "Eigenschaften:\n"
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, fuzzy, c-format
 msgid "Public: %s"
 msgstr "Öffentlich: %s\n"
@@ -1960,11 +1952,11 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -2118,7 +2110,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2258,7 +2250,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2316,7 +2308,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2324,7 +2316,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, fuzzy, c-format
 msgid "Size: %.2fMB"
 msgstr "Größe: %.2vMB\n"
@@ -2338,7 +2330,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2387,7 +2379,7 @@ msgstr "Profil %s gelöscht\n"
 
 #: lxc/storage.go:142
 #, fuzzy, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr "Profil %s erstellt\n"
 
 #: lxc/init.go:46
@@ -2497,7 +2489,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "Wartezeit bevor der Container gestoppt wird."
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 #, fuzzy
 msgid "Timestamps:"
 msgstr "Zeitstempel:\n"
@@ -2535,7 +2527,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2553,7 +2545,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2571,7 +2563,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2606,7 +2598,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr "Alternatives config Verzeichnis."
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2852,7 +2844,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2896,7 +2888,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2959,7 +2951,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2988,7 +2980,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3240,7 +3232,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3306,7 +3298,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 #, fuzzy
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -3435,7 +3427,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3560,7 +3552,7 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 8f4719f9..105b95b3 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65@gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -146,7 +146,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -170,15 +170,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -237,11 +237,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -287,7 +287,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -303,7 +303,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -345,7 +345,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -403,18 +403,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -561,7 +561,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -579,7 +579,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -649,8 +649,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -776,7 +776,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -817,12 +817,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -846,7 +846,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -877,7 +877,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -984,7 +984,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -993,12 +993,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1097,7 +1097,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1109,12 +1109,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1203,7 +1203,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1225,11 +1225,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1393,6 +1393,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1515,10 +1525,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1536,7 +1542,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1582,20 +1588,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1604,7 +1596,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1641,7 +1633,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1742,7 +1734,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1750,7 +1742,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1771,11 +1763,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1919,7 +1911,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2052,7 +2044,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2108,7 +2100,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2116,7 +2108,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2130,7 +2122,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2177,7 +2169,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2277,7 +2269,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2314,7 +2306,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2332,7 +2324,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2350,7 +2342,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2384,7 +2376,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2611,7 +2603,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2655,7 +2647,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2718,7 +2710,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2747,7 +2739,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2990,7 +2982,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3040,7 +3032,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3156,7 +3148,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3273,6 +3265,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 8d369c9a..58392b7e 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: 2018-02-10 11:39+0000\n"
 "Last-Translator: Allan Esquivel Sibaja <allan.esquivel.sibaja@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -203,7 +203,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -227,15 +227,15 @@ msgstr "%s no es un tipo de archivo soportado."
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -295,11 +295,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr "Aliases:"
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr "Arquitectura: %s"
@@ -345,7 +345,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr "Tipo de autenticación %s no está soportada por el servidor"
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr "Auto actualización: %s"
@@ -361,7 +361,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr "Propiedad mala: %s"
@@ -402,7 +402,7 @@ msgstr "CREADO"
 msgid "CREATED AT"
 msgstr "CREADO EN"
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr "Cacheado: %s"
@@ -460,18 +460,18 @@ msgstr "Certificado del cliente almacenado en el servidor:"
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "Columnas"
 
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -637,7 +637,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -707,8 +707,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -833,7 +833,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -874,12 +874,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -903,7 +903,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -934,7 +934,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -959,7 +959,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -1029,7 +1029,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -1041,7 +1041,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -1050,12 +1050,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1097,7 +1097,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1154,7 +1154,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1166,12 +1166,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1261,7 +1261,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1283,11 +1283,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1451,6 +1451,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1574,10 +1584,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1595,7 +1601,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1640,20 +1646,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1662,7 +1654,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1699,7 +1691,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1800,7 +1792,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1808,7 +1800,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1829,11 +1821,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1977,7 +1969,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2110,7 +2102,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2166,7 +2158,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2174,7 +2166,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2188,7 +2180,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2235,7 +2227,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2335,7 +2327,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2372,7 +2364,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2390,7 +2382,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2408,7 +2400,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2442,7 +2434,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2670,7 +2662,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2714,7 +2706,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2777,7 +2769,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2806,7 +2798,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3049,7 +3041,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3099,7 +3091,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3215,7 +3207,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3333,7 +3325,7 @@ msgstr ""
 msgid "volume"
 msgstr "Columnas"
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 30ba18b7..7d4fd90a 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index efb3f316..3ee6144d 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 36be3f8b..d70e4c84 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: 2018-03-06 13:50+0000\n"
 "Last-Translator: Alban Vidal <alban.vidal@zordhak.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -242,7 +242,7 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (%d de plus)"
@@ -266,16 +266,16 @@ msgstr "'%s' n'est pas un format de fichier pris en charge."
 msgid "(none)"
 msgstr "(aucun)"
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 #, fuzzy
 msgid "ALIASES"
 msgstr "ALIAS"
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr "ARCH"
 
@@ -337,11 +337,11 @@ msgstr "le serveur distant %s n'existe pas"
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr "Alias :"
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architecture : %s"
@@ -388,7 +388,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr "Le type d'authentification '%s' n'est pas supporté par le serveur"
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr "Mise à jour auto. : %s"
@@ -404,7 +404,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr "Mauvaise propriété : %s"
@@ -446,7 +446,7 @@ msgstr "CRÉÉ À"
 msgid "CREATED AT"
 msgstr "CRÉÉ À"
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, fuzzy, c-format
 msgid "Cached: %s"
 msgstr "Créé : %s"
@@ -508,18 +508,18 @@ msgstr "Certificat client enregistré sur le serveur : "
 msgid "Client version: %s\n"
 msgstr "Afficher la version du client"
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "Colonnes"
 
@@ -696,7 +696,7 @@ msgstr "Créé : %s"
 msgid "Create storage pools"
 msgstr "Copie de l'image : %s"
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr "Créé : %s"
@@ -714,7 +714,7 @@ msgstr "Création du conteneur"
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -788,8 +788,8 @@ msgstr "Copie de l'image : %s"
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -917,7 +917,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -967,12 +967,12 @@ msgstr ""
 "sélectionné si à la fois stdin et stdout sont des terminaux (stderr\n"
 "est ignoré)."
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr "Expire : %s"
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr "N'expire jamais"
 
@@ -998,7 +998,7 @@ msgstr "Import de l'image : %s"
 msgid "FILENAME"
 msgstr "NOM"
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
@@ -1031,7 +1031,7 @@ msgstr "Mode rapide (identique à --columns=nsacPt"
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Empreinte : %s"
@@ -1057,7 +1057,7 @@ msgstr "Forcer la suppression des conteneurs arrêtés"
 msgid "Force using the local unix socket"
 msgstr "Forcer l'utilisation de la socket unix locale"
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -1136,7 +1136,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -1149,7 +1149,7 @@ msgstr "Image copiée avec succès !"
 msgid "Image exported successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -1158,12 +1158,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr "Image importée avec l'empreinte : %s"
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Image importée avec l'empreinte : %s"
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 #, fuzzy
 msgid "Image refreshed successfully!"
 msgstr "Image copiée avec succès !"
@@ -1207,7 +1207,7 @@ msgstr "Clé de configuration invalide"
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, fuzzy, c-format
 msgid "Invalid format %q"
 msgstr "Cible invalide %s"
@@ -1265,7 +1265,7 @@ msgstr "Garder l'image à jour après la copie initiale"
 msgid "LAST USED AT"
 msgstr "DERNIÈRE UTILISATION À"
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1277,12 +1277,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr "Dernière utilisation : %s"
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr "Dernière utilisation : jamais"
 
@@ -1376,7 +1376,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1457,11 +1457,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1633,6 +1633,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, fuzzy, c-format
+msgid "Member %s removed"
+msgstr "Profil %s supprimé de %s"
+
+#: lxc/cluster.go:221
+#, fuzzy, c-format
+msgid "Member %s renamed to %s"
+msgstr "Profil %s ajouté à %s"
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr "Mémoire (courante)"
@@ -1766,10 +1776,6 @@ msgstr "NOM"
 msgid "NO"
 msgstr "NON"
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1787,7 +1793,7 @@ msgstr "Le réseau %s a été supprimé"
 
 #: lxc/network.go:301
 #, fuzzy, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr "Le réseau %s a été créé"
 
 #: lxc/network.go:906
@@ -1835,21 +1841,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, fuzzy, c-format
-msgid "Node %s removed"
-msgstr "Profil %s supprimé de %s"
-
-#: lxc/cluster.go:221
-#, fuzzy, c-format
-msgid "Node %s renamed to %s"
-msgstr "Profil %s ajouté à %s"
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-#, fuzzy
-msgid "Node name"
-msgstr "Nom du réseau"
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1859,7 +1850,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr "Seules les URLs https sont supportées par simplestreams"
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr "Seul https:// est supporté par l'import d'images distantes."
 
@@ -1896,7 +1887,7 @@ msgstr "PROFILS"
 msgid "PROTOCOL"
 msgstr "PROTOCOLE"
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr "PUBLIC"
 
@@ -1998,7 +1989,7 @@ msgstr "Profils %s appliqués à %s"
 msgid "Profiles: %s"
 msgstr "Profils : %s"
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr "Propriétés :"
 
@@ -2006,7 +1997,7 @@ msgstr "Propriétés :"
 msgid "Public image server"
 msgstr "Serveur d'images public"
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr "Public : %s"
@@ -2031,12 +2022,12 @@ msgstr "Création du conteneur"
 msgid "Recursively transfer files"
 msgstr "Pousser ou récupérer des fichiers récursivement"
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 #, fuzzy
 msgid "Refresh images"
 msgstr "Récupération de l'image : %s"
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "Récupération de l'image : %s"
@@ -2190,7 +2181,7 @@ msgstr "Récupération de l'image : %s"
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr "TAILLE"
 
@@ -2337,7 +2328,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2400,7 +2391,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2408,7 +2399,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "Taille : %.2f Mo"
@@ -2422,7 +2413,7 @@ msgstr "Instantanés :"
 msgid "Some containers failed to %s"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr "Source :"
 
@@ -2471,7 +2462,7 @@ msgstr "Le réseau %s a été supprimé"
 
 #: lxc/storage.go:142
 #, fuzzy, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr "Le réseau %s a été créé"
 
 #: lxc/init.go:46
@@ -2580,7 +2571,7 @@ msgstr "Il n'existe pas d'\"image\".  Vouliez-vous un alias ?"
 msgid "Time to wait for the container before killing it"
 msgstr "Temps d'attente du conteneur avant de le tuer"
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr "Horodatage :"
 
@@ -2618,7 +2609,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr "Transfert de l'image : %s"
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr "Transfert de l'image : %s"
@@ -2636,7 +2627,7 @@ msgstr "Type : éphémère"
 msgid "Type: persistent"
 msgstr "Type : persistant"
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
@@ -2654,7 +2645,7 @@ msgstr "UTILISÉ PAR"
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2694,7 +2685,7 @@ msgstr "Clé de configuration invalide"
 msgid "Unset storage volume configuration keys"
 msgstr "Clé de configuration invalide"
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr "Publié : %s"
@@ -2944,7 +2935,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr "pas d'image, conteneur ou instantané affecté sur ce serveur"
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr "désactivé"
 
@@ -2988,7 +2979,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr "activé"
 
@@ -3052,7 +3043,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3081,7 +3072,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3355,7 +3346,7 @@ msgstr ""
 msgid "network"
 msgstr "Nom du réseau"
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr "non"
 
@@ -3428,7 +3419,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 #, fuzzy
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -3562,7 +3553,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3688,10 +3679,14 @@ msgstr ""
 msgid "volume"
 msgstr "Colonnes"
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr "oui"
 
+#, fuzzy
+#~ msgid "Node name"
+#~ msgstr "Nom du réseau"
+
 #~ msgid "Can't unset key '%s', it's not currently set."
 #~ msgstr ""
 #~ "Impossible de désaffecter la clé '%s', elle n'est pas définie "
diff --git a/po/hi.po b/po/hi.po
index 711eb1e0..b7d898d5 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 4cccc3aa..401f2c07 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index d4d68b38..f16d9fab 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: 2017-08-18 14:22+0000\n"
 "Last-Translator: Alberto Donato <alberto.donato@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -168,7 +168,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (altri %d)"
@@ -192,15 +192,15 @@ msgstr "'%s' non è un tipo di file supportato."
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr "ALIAS"
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr "ARCH"
 
@@ -260,11 +260,11 @@ msgstr "il remote %s non esiste"
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr "Alias:"
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architettura: %s"
@@ -310,7 +310,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr "Aggiornamento automatico: %s"
@@ -326,7 +326,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr "Proprietà errata: %s"
@@ -368,7 +368,7 @@ msgstr "CREATO IL"
 msgid "CREATED AT"
 msgstr "CREATO IL"
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -426,18 +426,18 @@ msgstr "Certificato del client salvato dal server: "
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "Colonne"
 
@@ -586,7 +586,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -604,7 +604,7 @@ msgstr "Creazione del container in corso"
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr "DESCRIZIONE"
@@ -674,8 +674,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -800,7 +800,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -841,12 +841,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr "'%s' non è un tipo di file supportato."
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -927,7 +927,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -998,7 +998,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Creazione del container in corso"
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -1010,7 +1010,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -1019,12 +1019,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1066,7 +1066,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, fuzzy, c-format
 msgid "Invalid format %q"
 msgstr "Proprietà errata: %s"
@@ -1124,7 +1124,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1136,12 +1136,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1232,7 +1232,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1254,11 +1254,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1424,6 +1424,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1546,10 +1556,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1567,7 +1573,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1612,20 +1618,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1671,7 +1663,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1773,7 +1765,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1781,7 +1773,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1802,11 +1794,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1951,7 +1943,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2084,7 +2076,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2140,7 +2132,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2148,7 +2140,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2162,7 +2154,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2210,7 +2202,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2312,7 +2304,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2349,7 +2341,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2367,7 +2359,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2385,7 +2377,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2419,7 +2411,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2692,7 +2684,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2755,7 +2747,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2784,7 +2776,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3027,7 +3019,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr "no"
 
@@ -3077,7 +3069,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3193,7 +3185,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3311,7 +3303,7 @@ msgstr ""
 msgid "volume"
 msgstr "Colonne"
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr "si"
 
diff --git a/po/ja.po b/po/ja.po
index 798862d1..68617c92 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: 2018-03-01 17:11+0000\n"
 "Last-Translator: KATOH Yasufumi <karma@jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -146,7 +146,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (他%d個)"
@@ -171,15 +171,15 @@ msgstr "'%s' はサポートされないタイプのファイルです。"
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -241,11 +241,11 @@ msgstr "エイリアス %s は存在しません"
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr "エイリアス:"
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr "アーキテクチャ: %s"
@@ -294,7 +294,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr "認証タイプ '%s' はサーバではサポートされていません"
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr "自動更新: %s"
@@ -310,7 +310,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr "不正なイメージプロパティ形式: %s"
@@ -351,7 +351,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr "キャッシュ済: %s"
@@ -412,18 +412,18 @@ msgstr "クライアント証明書がサーバに格納されました: "
 msgid "Client version: %s\n"
 msgstr "クライアントのバージョンを表示します"
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "カラムレイアウト"
 
@@ -594,7 +594,7 @@ msgstr "作成日時: %s"
 msgid "Create storage pools"
 msgstr "ストレージボリュームのコピー中: %s"
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr "作成日時: %s"
@@ -612,7 +612,7 @@ msgstr "コンテナを作成中"
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -687,8 +687,8 @@ msgstr "ストレージボリュームの移動中: %s"
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -817,7 +817,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -873,12 +873,12 @@ msgstr ""
 "デフォルトのモードは non-interactive です。もし標準入出力が両方ともターミナル"
 "の場合は interactive モードが選択されます (標準エラー出力は無視されます)。"
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr "失効日時: %s"
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr "失効日時: 失効しない"
 
@@ -903,7 +903,7 @@ msgstr "イメージのエクスポート中: %s"
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -934,7 +934,7 @@ msgstr "Fast モード (--columns=nsacPt と同じ)"
 msgid "Filtering isn't supported yet"
 msgstr "情報表示のフィルタリングはまだサポートされていません"
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
@@ -959,7 +959,7 @@ msgstr "稼働中のコンテナを強制的に削除します"
 msgid "Force using the local unix socket"
 msgstr "強制的にローカルのUNIXソケットを使います"
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr "フォーマット (csv|json|table|yaml)"
 
@@ -1033,7 +1033,7 @@ msgstr "初めてこのマシンで LXD を使う場合、lxd init と実行す
 msgid "Ignore the container state"
 msgstr "コンテナの状態を無視します (startのみ)"
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr "イメージは更新済みです。"
 
@@ -1045,7 +1045,7 @@ msgstr "イメージのコピーが成功しました!"
 msgid "Image exported successfully!"
 msgstr "イメージのエクスポートが成功しました!"
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -1054,12 +1054,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr "イメージは以下のフィンガープリントでインポートされました: %s"
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "イメージは以下のフィンガープリントでインポートされました: %s"
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr "イメージの更新が成功しました!"
 
@@ -1102,7 +1102,7 @@ msgstr "正しくない設定項目 (key) です"
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, fuzzy, c-format
 msgid "Invalid format %q"
 msgstr "不正なパス %s"
@@ -1160,7 +1160,7 @@ msgstr "最初にコピーした後も常にイメージを最新の状態に保
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1172,12 +1172,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr "最終使用: %s"
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr "最終使用: 未使用"
 
@@ -1273,7 +1273,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1388,11 +1388,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1569,6 +1569,16 @@ msgstr "リモートのlxcサーバを管理します。\n"
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, fuzzy, c-format
+msgid "Member %s removed"
+msgstr "ノード %s が削除されました"
+
+#: lxc/cluster.go:221
+#, fuzzy, c-format
+msgid "Member %s renamed to %s"
+msgstr "ノード名 %s を %s に変更しました"
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr "メモリ (現在値)"
@@ -1701,10 +1711,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1721,8 +1727,8 @@ msgid "Network %s deleted"
 msgstr "ネットワーク %s を削除しました"
 
 #: lxc/network.go:301
-#, c-format
-msgid "Network %s pending on node %s"
+#, fuzzy, c-format
+msgid "Network %s pending on member %s"
 msgstr "ネットワーク %s はノード %s 上でペンディング状態です"
 
 #: lxc/network.go:906
@@ -1768,20 +1774,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr "ノード %s が削除されました"
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr "ノード名 %s を %s に変更しました"
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr "ノード名"
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr "\"カスタム\" のボリュームのみがコンテナにアタッチできます。"
@@ -1790,7 +1782,7 @@ msgstr "\"カスタム\" のボリュームのみがコンテナにアタッチ
 msgid "Only https URLs are supported for simplestreams"
 msgstr "simplestreams は https の URL のみサポートします"
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr "リモートイメージのインポートは https:// のみをサポートします。"
 
@@ -1827,7 +1819,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1929,7 +1921,7 @@ msgstr "プロファイル %s が %s に追加されました"
 msgid "Profiles: %s"
 msgstr "プロファイル: %s"
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr "プロパティ:"
 
@@ -1937,7 +1929,7 @@ msgstr "プロパティ:"
 msgid "Public image server"
 msgstr "Public なイメージサーバとして設定します"
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr "パブリック: %s"
@@ -1962,12 +1954,12 @@ msgstr "コンテナを一時停止します。"
 msgid "Recursively transfer files"
 msgstr "再帰的にファイルをpush/pullします"
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 #, fuzzy
 msgid "Refresh images"
 msgstr "イメージの更新中: %s"
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr "イメージの更新中: %s"
@@ -2120,7 +2112,7 @@ msgstr "イメージの取得中: %s"
 msgid "Run command against all containers"
 msgstr "すべてのコンテナに対してコマンドを実行します"
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2264,7 +2256,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2327,7 +2319,7 @@ msgstr "ストレージプールで利用可能なリソースを表示します
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2336,7 +2328,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr "ストレージプールで利用可能なリソースを表示します"
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "サイズ: %.2fMB"
@@ -2350,7 +2342,7 @@ msgstr "スナップショット:"
 msgid "Some containers failed to %s"
 msgstr "一部のコンテナで %s が失敗しました"
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr "取得元:"
 
@@ -2398,8 +2390,8 @@ msgid "Storage pool %s deleted"
 msgstr "ストレージプール %s を削除しました"
 
 #: lxc/storage.go:142
-#, c-format
-msgid "Storage pool %s pending on node %s"
+#, fuzzy, c-format
+msgid "Storage pool %s pending on member %s"
 msgstr "ストレージプール %s はノード %s 上でペンディング状態です"
 
 #: lxc/init.go:46
@@ -2507,7 +2499,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "コンテナを強制停止するまでの時間"
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr "タイムスタンプ:"
 
@@ -2550,7 +2542,7 @@ msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpu
 msgid "Transferring container: %s"
 msgstr "コンテナを転送中: %s"
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr "イメージを転送中: %s"
@@ -2568,7 +2560,7 @@ msgstr "タイプ: ephemeral"
 msgid "Type: persistent"
 msgstr "タイプ: persistent"
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2586,7 +2578,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2626,7 +2618,7 @@ msgstr "正しくない設定項目 (key) です"
 msgid "Unset storage volume configuration keys"
 msgstr "正しくない設定項目 (key) です"
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr "アップロード日時: %s"
@@ -2873,7 +2865,7 @@ msgstr ""
 "サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
 "した"
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr "無効"
 
@@ -2917,7 +2909,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr "有効"
 
@@ -2980,7 +2972,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -3009,7 +3001,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3286,7 +3278,7 @@ msgstr ""
 msgid "network"
 msgstr "ネットワーク名:"
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3356,7 +3348,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 #, fuzzy
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -3489,7 +3481,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3615,10 +3607,13 @@ msgstr ""
 msgid "volume"
 msgstr "カラムレイアウト"
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
 
+#~ msgid "Node name"
+#~ msgstr "ノード名"
+
 #~ msgid "Can't unset key '%s', it's not currently set."
 #~ msgstr "キー '%s' が指定されていないので削除できません。"
 
diff --git a/po/lxd.pot b/po/lxd.pot
index d8a3d8d4..2307e107 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@lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2018-03-30 11:25-0400\n"
+        "POT-Creation-Date: 2018-04-02 19:23-0400\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -136,7 +136,7 @@ msgid   "### This is a yaml representation of the profile.\n"
         "### Note that the name is shown but cannot be changed"
 msgstr  ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid   "%s (%d more)"
 msgstr  ""
@@ -160,15 +160,15 @@ msgstr  ""
 msgid   "(none)"
 msgstr  ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid   "ALIAS"
 msgstr  ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid   "ALIASES"
 msgstr  ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid   "ARCH"
 msgstr  ""
 
@@ -227,11 +227,11 @@ msgstr  ""
 msgid   "Alias name missing"
 msgstr  ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid   "Aliases:"
 msgstr  ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid   "Architecture: %s"
 msgstr  ""
@@ -276,7 +276,7 @@ msgstr  ""
 msgid   "Authentication type '%s' not supported by server"
 msgstr  ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid   "Auto update: %s"
 msgstr  ""
@@ -291,7 +291,7 @@ msgstr  ""
 msgid   "Bad key=value pair: %s"
 msgstr  ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid   "Bad property: %s"
 msgstr  ""
@@ -332,7 +332,7 @@ msgstr  ""
 msgid   "CREATED AT"
 msgstr  ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid   "Cached: %s"
 msgstr  ""
@@ -389,11 +389,11 @@ msgstr  ""
 msgid   "Client version: %s\n"
 msgstr  ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429 lxc/storage_volume.go:504 lxc/storage_volume.go:730 lxc/storage_volume.go:856 lxc/storage_volume.go:998 lxc/storage_volume.go:1028 lxc/storage_volume.go:1092 lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429 lxc/storage_volume.go:504 lxc/storage_volume.go:730 lxc/storage_volume.go:856 lxc/storage_volume.go:998 lxc/storage_volume.go:1028 lxc/storage_volume.go:1092 lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid   "Cluster member name"
 msgstr  ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid   "Columns"
 msgstr  ""
 
@@ -535,7 +535,7 @@ msgstr  ""
 msgid   "Create storage pools"
 msgstr  ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid   "Created: %s"
 msgstr  ""
@@ -553,7 +553,7 @@ msgstr  ""
 msgid   "DATABASE"
 msgstr  ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784 lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784 lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid   "DESCRIPTION"
 msgstr  ""
 
@@ -605,7 +605,7 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90 lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147 lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142 lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54 lxc/config_metadata.go:176 lxc/config_template.go:30 lxc/config_template.go:67 lxc/config_template.go:110 lxc/config_template.go:152 lxc/config_template.go:236 lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59 lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32 lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73 lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42 lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212 lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250 lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32 lxc/network.go:104 lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367 lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719 lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989 lxc/network.go:1051 lxc/operation.go:25 lxc/operation.go:54 lxc/operation.go:98 lxc/operation.go:174 lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241 lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520 lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753 lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27 lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414 lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636 lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:161 lxc/storage.go:208 lxc/storage.go:328 lxc/storage.go:383 lxc/storage.go:491 lxc/storage.go:573 lxc/storage.go:645 lxc/storage.go:729 lxc/storage_volume.go:34 lxc/storage_volume.go:122 lxc/storage_volume.go:201 lxc/storage_volume.go:283 lxc/storage_volume.go:426 lxc/storage_volume.go:501 lxc/storage_volume.go:561 lxc/storage_volume.go:643 lxc/storage_volume.go:724 lxc/storage_volume.go:853 lxc/storage_volume.go:918 lxc/storage_volume.go:994 lxc/storage_volume.go:1025 lxc/storage_volume.go:1089 lxc/storage_volume.go:1166 lxc/storage_volume.go:1241 lxc/version.go:22
+#: lxc/action.go:30 lxc/action.go:49 lxc/action.go:69 lxc/action.go:90 lxc/alias.go:23 lxc/alias.go:55 lxc/alias.go:99 lxc/alias.go:147 lxc/alias.go:198 lxc/cluster.go:26 lxc/cluster.go:59 lxc/cluster.go:142 lxc/cluster.go:192 lxc/cluster.go:238 lxc/config.go:29 lxc/config.go:88 lxc/config.go:289 lxc/config.go:355 lxc/config.go:452 lxc/config.go:560 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:179 lxc/config_device.go:252 lxc/config_device.go:318 lxc/config_device.go:405 lxc/config_device.go:493 lxc/config_device.go:582 lxc/config_device.go:650 lxc/config_metadata.go:29 lxc/config_metadata.go:54 lxc/config_metadata.go:176 lxc/config_template.go:30 lxc/config_template.go:67 lxc/config_template.go:110 lxc/config_template.go:152 lxc/config_template.go:236 lxc/config_template.go:298 lxc/config_trust.go:30 lxc/config_trust.go:59 lxc/config_trust.go:115 lxc/config_trust.go:197 lxc/console.go:32 lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73 lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42 lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435 lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211 lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59 lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250 lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46 lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32 lxc/network.go:104 lxc/network.go:177 lxc/network.go:250 lxc/network.go:320 lxc/network.go:367 lxc/network.go:452 lxc/network.go:537 lxc/network.go:660 lxc/network.go:719 lxc/network.go:808 lxc/network.go:873 lxc/network.go:920 lxc/network.go:989 lxc/network.go:1051 lxc/operation.go:25 lxc/operation.go:54 lxc/operation.go:98 lxc/operation.go:174 lxc/profile.go:30 lxc/profile.go:102 lxc/profile.go:163 lxc/profile.go:241 lxc/profile.go:297 lxc/profile.go:348 lxc/profile.go:396 lxc/profile.go:520 lxc/profile.go:568 lxc/profile.go:632 lxc/profile.go:705 lxc/profile.go:753 lxc/profile.go:812 lxc/profile.go:866 lxc/publish.go:34 lxc/query.go:27 lxc/remote.go:34 lxc/remote.go:84 lxc/remote.go:380 lxc/remote.go:414 lxc/remote.go:487 lxc/remote.go:549 lxc/remote.go:598 lxc/remote.go:636 lxc/rename.go:20 lxc/restore.go:24 lxc/snapshot.go:21 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:161 lxc/storage.go:208 lxc/storage.go:328 lxc/storage.go:383 lxc/storage.go:491 lxc/storage.go:573 lxc/storage.go:645 lxc/storage.go:729 lxc/storage_volume.go:34 lxc/storage_volume.go:122 lxc/storage_volume.go:201 lxc/storage_volume.go:283 lxc/storage_volume.go:426 lxc/storage_volume.go:501 lxc/storage_volume.go:561 lxc/storage_volume.go:643 lxc/storage_volume.go:724 lxc/storage_volume.go:853 lxc/storage_volume.go:918 lxc/storage_volume.go:994 lxc/storage_volume.go:1025 lxc/storage_volume.go:1089 lxc/storage_volume.go:1166 lxc/storage_volume.go:1241 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -705,7 +705,7 @@ msgstr  ""
 msgid   "Edit storage volume configurations as YAML"
 msgstr  ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid   "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr  ""
@@ -744,12 +744,12 @@ msgid   "Execute commands in containers\n"
         "Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored)."
 msgstr  ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid   "Expires: %s"
 msgstr  ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid   "Expires: never"
 msgstr  ""
 
@@ -772,7 +772,7 @@ msgstr  ""
 msgid   "FILENAME"
 msgstr  ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid   "FINGERPRINT"
 msgstr  ""
 
@@ -803,7 +803,7 @@ msgstr  ""
 msgid   "Filtering isn't supported yet"
 msgstr  ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid   "Fingerprint: %s"
 msgstr  ""
@@ -828,7 +828,7 @@ msgstr  ""
 msgid   "Force using the local unix socket"
 msgstr  ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
@@ -896,7 +896,7 @@ msgstr  ""
 msgid   "Ignore the container state"
 msgstr  ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid   "Image already up to date."
 msgstr  ""
 
@@ -908,7 +908,7 @@ msgstr  ""
 msgid   "Image exported successfully!"
 msgstr  ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid   "Image identifier missing"
 msgstr  ""
 
@@ -917,12 +917,12 @@ msgstr  ""
 msgid   "Image identifier missing: %s"
 msgstr  ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid   "Image imported with fingerprint: %s"
 msgstr  ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid   "Image refreshed successfully!"
 msgstr  ""
 
@@ -963,7 +963,7 @@ msgstr  ""
 msgid   "Invalid config key column format (too many fields): '%s'"
 msgstr  ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid   "Invalid format %q"
 msgstr  ""
@@ -1019,7 +1019,7 @@ msgstr  ""
 msgid   "LAST USED AT"
 msgstr  ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid   "LOCATION"
 msgstr  ""
 
@@ -1031,12 +1031,12 @@ msgstr  ""
 msgid   "LXD server isn't part of a cluster"
 msgstr  ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid   "Last used: %s"
 msgstr  ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid   "Last used: never"
 msgstr  ""
 
@@ -1121,7 +1121,7 @@ msgid   "List containers\n"
         "  s - State\n"
         "  S - Number of snapshots\n"
         "  t - Type (persistent or ephemeral)\n"
-        "  L - Location of the container (e.g. its node)\n"
+        "  L - Location of the container (e.g. its cluster member)\n"
         "\n"
         "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
         "  KEY: The (extended) config key to display\n"
@@ -1142,11 +1142,11 @@ msgid   "List image aliases\n"
         "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr  ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid   "List images"
 msgstr  ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid   "List images\n"
         "\n"
         "Filters may be of the <key>=<value> form for property based filtering,\n"
@@ -1306,6 +1306,16 @@ msgstr  ""
 msgid   "Manage trusted clients"
 msgstr  ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid   "Member %s removed"
+msgstr  ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid   "Member %s renamed to %s"
+msgstr  ""
+
 #: lxc/info.go:201
 msgid   "Memory (current)"
 msgstr  ""
@@ -1409,10 +1419,6 @@ msgstr  ""
 msgid   "NO"
 msgstr  ""
 
-#: lxc/storage_volume.go:971
-msgid   "NODE"
-msgstr  ""
-
 #: lxc/info.go:125
 #, c-format
 msgid   "Name: %s"
@@ -1430,7 +1436,7 @@ msgstr  ""
 
 #: lxc/network.go:301
 #, c-format
-msgid   "Network %s pending on node %s"
+msgid   "Network %s pending on member %s"
 msgstr  ""
 
 #: lxc/network.go:906
@@ -1475,20 +1481,6 @@ msgstr  ""
 msgid   "No value found in %q"
 msgstr  ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid   "Node %s removed"
-msgstr  ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid   "Node %s renamed to %s"
-msgstr  ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid   "Node name"
-msgstr  ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid   "Only \"custom\" volumes can be attached to containers."
 msgstr  ""
@@ -1497,7 +1489,7 @@ msgstr  ""
 msgid   "Only https URLs are supported for simplestreams"
 msgstr  ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid   "Only https:// is supported for remote image import."
 msgstr  ""
 
@@ -1534,7 +1526,7 @@ msgstr  ""
 msgid   "PROTOCOL"
 msgstr  ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid   "PUBLIC"
 msgstr  ""
 
@@ -1633,7 +1625,7 @@ msgstr  ""
 msgid   "Profiles: %s"
 msgstr  ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid   "Properties:"
 msgstr  ""
 
@@ -1641,7 +1633,7 @@ msgstr  ""
 msgid   "Public image server"
 msgstr  ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid   "Public: %s"
 msgstr  ""
@@ -1662,11 +1654,11 @@ msgstr  ""
 msgid   "Recursively transfer files"
 msgstr  ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid   "Refresh images"
 msgstr  ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid   "Refreshing the image: %s"
 msgstr  ""
@@ -1807,7 +1799,7 @@ msgstr  ""
 msgid   "Run command against all containers"
 msgstr  ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid   "SIZE"
 msgstr  ""
 
@@ -1940,7 +1932,7 @@ msgstr  ""
 msgid   "Show full device configuration for containers or profiles"
 msgstr  ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid   "Show image properties"
 msgstr  ""
 
@@ -1996,7 +1988,7 @@ msgstr  ""
 msgid   "Show the used and free space in bytes"
 msgstr  ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid   "Show useful information about images"
 msgstr  ""
 
@@ -2004,7 +1996,7 @@ msgstr  ""
 msgid   "Show useful information about storage pools"
 msgstr  ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid   "Size: %.2fMB"
 msgstr  ""
@@ -2018,7 +2010,7 @@ msgstr  ""
 msgid   "Some containers failed to %s"
 msgstr  ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid   "Source:"
 msgstr  ""
 
@@ -2065,7 +2057,7 @@ msgstr  ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid   "Storage pool %s pending on node %s"
+msgid   "Storage pool %s pending on member %s"
 msgstr  ""
 
 #: lxc/init.go:46
@@ -2160,7 +2152,7 @@ msgstr  ""
 msgid   "Time to wait for the container before killing it"
 msgstr  ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid   "Timestamps:"
 msgstr  ""
 
@@ -2197,7 +2189,7 @@ msgstr  ""
 msgid   "Transferring container: %s"
 msgstr  ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid   "Transferring image: %s"
 msgstr  ""
@@ -2215,7 +2207,7 @@ msgstr  ""
 msgid   "Type: persistent"
 msgstr  ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid   "UPLOAD DATE"
 msgstr  ""
 
@@ -2232,7 +2224,7 @@ msgstr  ""
 msgid   "Unable to create a temporary file: %v"
 msgstr  ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid   "Unknown column shorthand char '%c' in '%s'"
 msgstr  ""
@@ -2266,7 +2258,7 @@ msgstr  ""
 msgid   "Unset storage volume configuration keys"
 msgstr  ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid   "Uploaded: %s"
 msgstr  ""
@@ -2483,7 +2475,7 @@ msgstr  ""
 msgid   "didn't get any affected image, container or snapshot from server"
 msgstr  ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid   "disabled"
 msgstr  ""
 
@@ -2527,7 +2519,7 @@ msgstr  ""
 msgid   "edit [<remote>:][<container>]"
 msgstr  ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid   "enabled"
 msgstr  ""
 
@@ -2588,7 +2580,7 @@ msgstr  ""
 msgid   "info"
 msgstr  ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid   "info [<remote>:]<image>"
 msgstr  ""
 
@@ -2616,7 +2608,7 @@ msgstr  ""
 msgid   "list [<remote>:]"
 msgstr  ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid   "list [<remote>:] [<filter>...]"
 msgstr  ""
 
@@ -2826,7 +2818,7 @@ msgstr  ""
 msgid   "network"
 msgstr  ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid   "no"
 msgstr  ""
 
@@ -2870,7 +2862,7 @@ msgstr  ""
 msgid   "query [<remote>:]<API path>"
 msgstr  ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid   "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr  ""
 
@@ -2986,7 +2978,7 @@ msgstr  ""
 msgid   "show [<remote>:]<container|profile>"
 msgstr  ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid   "show [<remote>:]<image>"
 msgstr  ""
 
@@ -3103,7 +3095,7 @@ msgstr  ""
 msgid   "volume"
 msgstr  ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid   "yes"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 3a847b2c..500baba2 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index b729d880..b3580362 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index d1f5737b..b8877fe6 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index e6f94e82..4f3b37f6 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fecb480c..5922ae51 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: 2018-03-08 09:21+0000\n"
 "Last-Translator: Paulo Coghi <paulo@coghi.com.br>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -160,7 +160,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -184,15 +184,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -251,11 +251,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -301,7 +301,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -358,7 +358,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -416,18 +416,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -574,7 +574,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -592,7 +592,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -662,8 +662,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -788,7 +788,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -829,12 +829,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -858,7 +858,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -914,7 +914,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -984,7 +984,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -996,7 +996,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -1005,12 +1005,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1052,7 +1052,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1109,7 +1109,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1121,12 +1121,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1215,7 +1215,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1237,11 +1237,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1405,6 +1405,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1526,10 +1536,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1547,7 +1553,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1592,20 +1598,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1614,7 +1606,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1651,7 +1643,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1752,7 +1744,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1760,7 +1752,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1781,11 +1773,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1929,7 +1921,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2062,7 +2054,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2118,7 +2110,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2126,7 +2118,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2140,7 +2132,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2187,7 +2179,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2287,7 +2279,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2324,7 +2316,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2342,7 +2334,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2360,7 +2352,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2394,7 +2386,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2621,7 +2613,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2665,7 +2657,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2728,7 +2720,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2757,7 +2749,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3000,7 +2992,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3050,7 +3042,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3166,7 +3158,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3283,6 +3275,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 3ce4c83d..666da6ff 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: 2017-09-05 16:48+0000\n"
 "Last-Translator: Ilya Yakimavets <ilya.yakimavets@backend.expert>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -229,7 +229,7 @@ msgstr ""
 "###\n"
 "### Обратите внимание, что имя отображается, но не может быть изменено"
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -253,16 +253,16 @@ msgstr ""
 msgid "(none)"
 msgstr "(пусто)"
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr "ПСЕВДОНИМ"
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 #, fuzzy
 msgid "ALIASES"
 msgstr "ПСЕВДОНИМ"
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr "ARCH"
 
@@ -322,11 +322,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr "Псевдонимы:"
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr "Архитектура: %s"
@@ -372,7 +372,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr "Авто-обновление: %s"
@@ -388,7 +388,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -431,7 +431,7 @@ msgstr "СОЗДАН"
 msgid "CREATED AT"
 msgstr "СОЗДАН"
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -489,18 +489,18 @@ msgstr "Сертификат клиента хранится на сервере
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr "Столбцы"
 
@@ -652,7 +652,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr "Копирование образа: %s"
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -670,7 +670,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -743,8 +743,8 @@ msgstr "Копирование образа: %s"
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -871,7 +871,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -912,12 +912,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -942,7 +942,7 @@ msgstr "Копирование образа: %s"
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -973,7 +973,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -998,7 +998,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -1069,7 +1069,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -1090,12 +1090,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1207,12 +1207,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1303,7 +1303,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1325,11 +1325,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1497,6 +1497,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1622,10 +1632,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1643,7 +1649,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1689,20 +1695,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1711,7 +1703,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1748,7 +1740,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1849,7 +1841,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1857,7 +1849,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1878,12 +1870,12 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 #, fuzzy
 msgid "Refresh images"
 msgstr "Копирование образа: %s"
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "Копирование образа: %s"
@@ -2030,7 +2022,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2165,7 +2157,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2221,7 +2213,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2229,7 +2221,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2243,7 +2235,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2291,7 +2283,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2392,7 +2384,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2429,7 +2421,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2447,7 +2439,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2465,7 +2457,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2499,7 +2491,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2739,7 +2731,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2783,7 +2775,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2846,7 +2838,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2875,7 +2867,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -3122,7 +3114,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3184,7 +3176,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 #, fuzzy
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
@@ -3312,7 +3304,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3438,7 +3430,7 @@ msgstr ""
 msgid "volume"
 msgstr "Столбцы"
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr "да"
 
diff --git a/po/sr.po b/po/sr.po
index 980c5a88..2c688a3c 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 02514fb9..73976c95 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index abc05177..9bce0e52 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index e8670f5d..8cc228ad 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index a2ba0a91..53f8bb3c 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index 03cbc97c..45ff2723 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@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2018-03-30 11:25-0400\n"
+"POT-Creation-Date: 2018-04-02 19:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -143,7 +143,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:954
+#: lxc/image.go:953
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -167,15 +167,15 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/alias.go:127 lxc/image.go:921 lxc/image_alias.go:228
+#: lxc/alias.go:127 lxc/image.go:920 lxc/image_alias.go:228
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:922
+#: lxc/image.go:921
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:926
+#: lxc/image.go:925
 msgid "ARCH"
 msgstr ""
 
@@ -234,11 +234,11 @@ msgstr ""
 msgid "Alias name missing"
 msgstr ""
 
-#: lxc/image.go:854
+#: lxc/image.go:853
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:826 lxc/info.go:133
+#: lxc/image.go:825 lxc/info.go:133
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Authentication type '%s' not supported by server"
 msgstr ""
 
-#: lxc/image.go:864
+#: lxc/image.go:863
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Bad key=value pair: %s"
 msgstr ""
 
-#: lxc/image.go:677
+#: lxc/image.go:676
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/image.go:863
+#: lxc/image.go:862
 #, c-format
 msgid "Cached: %s"
 msgstr ""
@@ -399,18 +399,18 @@ msgstr ""
 msgid "Client version: %s\n"
 msgstr ""
 
-#: lxc/network.go:253 lxc/network.go:663 lxc/network.go:923 lxc/network.go:992
-#: lxc/network.go:1054 lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576
-#: lxc/storage.go:649 lxc/storage.go:732 lxc/storage_volume.go:287
-#: lxc/storage_volume.go:429 lxc/storage_volume.go:504
-#: lxc/storage_volume.go:730 lxc/storage_volume.go:856
-#: lxc/storage_volume.go:998 lxc/storage_volume.go:1028
-#: lxc/storage_volume.go:1092 lxc/storage_volume.go:1175
-#: lxc/storage_volume.go:1244
+#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47 lxc/network.go:253
+#: lxc/network.go:663 lxc/network.go:923 lxc/network.go:992 lxc/network.go:1054
+#: lxc/storage.go:92 lxc/storage.go:331 lxc/storage.go:576 lxc/storage.go:649
+#: lxc/storage.go:732 lxc/storage_volume.go:287 lxc/storage_volume.go:429
+#: lxc/storage_volume.go:504 lxc/storage_volume.go:730
+#: lxc/storage_volume.go:856 lxc/storage_volume.go:998
+#: lxc/storage_volume.go:1028 lxc/storage_volume.go:1092
+#: lxc/storage_volume.go:1175 lxc/storage_volume.go:1244
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/image.go:912 lxc/list.go:112
+#: lxc/image.go:911 lxc/list.go:112
 msgid "Columns"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "Create storage pools"
 msgstr ""
 
-#: lxc/image.go:832 lxc/info.go:135
+#: lxc/image.go:831 lxc/info.go:135
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -575,7 +575,7 @@ msgstr ""
 msgid "DATABASE"
 msgstr ""
 
-#: lxc/image.go:925 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
+#: lxc/image.go:924 lxc/image_alias.go:230 lxc/list.go:472 lxc/network.go:784
 #: lxc/operation.go:153 lxc/storage.go:545 lxc/storage_volume.go:967
 msgid "DESCRIPTION"
 msgstr ""
@@ -645,8 +645,8 @@ msgstr ""
 #: lxc/copy.go:35 lxc/delete.go:30 lxc/exec.go:39 lxc/file.go:40 lxc/file.go:73
 #: lxc/file.go:122 lxc/file.go:185 lxc/file.go:324 lxc/image.go:42
 #: lxc/image.go:131 lxc/image.go:261 lxc/image.go:312 lxc/image.go:435
-#: lxc/image.go:571 lxc/image.go:776 lxc/image.go:890 lxc/image.go:1212
-#: lxc/image.go:1285 lxc/image_alias.go:26 lxc/image_alias.go:59
+#: lxc/image.go:571 lxc/image.go:775 lxc/image.go:889 lxc/image.go:1211
+#: lxc/image.go:1284 lxc/image_alias.go:26 lxc/image_alias.go:59
 #: lxc/image_alias.go:106 lxc/image_alias.go:149 lxc/image_alias.go:250
 #: lxc/info.go:29 lxc/init.go:35 lxc/launch.go:22 lxc/list.go:48 lxc/main.go:46
 #: lxc/manpage.go:19 lxc/monitor.go:31 lxc/move.go:31 lxc/network.go:32
@@ -771,7 +771,7 @@ msgstr ""
 msgid "Edit storage volume configurations as YAML"
 msgstr ""
 
-#: lxc/image.go:936 lxc/list.go:510
+#: lxc/image.go:935 lxc/list.go:510
 #, c-format
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
@@ -812,12 +812,12 @@ msgid ""
 "AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:838
+#: lxc/image.go:837
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:840
+#: lxc/image.go:839
 msgid "Expires: never"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config_trust.go:174 lxc/image.go:923 lxc/image_alias.go:229
+#: lxc/config_trust.go:174 lxc/image.go:922 lxc/image_alias.go:229
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Filtering isn't supported yet"
 msgstr ""
 
-#: lxc/image.go:824
+#: lxc/image.go:823
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:913 lxc/list.go:113
+#: lxc/image.go:912 lxc/list.go:113
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Ignore the container state"
 msgstr ""
 
-#: lxc/image.go:1268
+#: lxc/image.go:1267
 msgid "Image already up to date."
 msgstr ""
 
@@ -979,7 +979,7 @@ msgstr ""
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:284 lxc/image.go:1235
+#: lxc/image.go:284 lxc/image.go:1234
 msgid "Image identifier missing"
 msgstr ""
 
@@ -988,12 +988,12 @@ msgstr ""
 msgid "Image identifier missing: %s"
 msgstr ""
 
-#: lxc/image.go:749
+#: lxc/image.go:748
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:1266
+#: lxc/image.go:1265
 msgid "Image refreshed successfully!"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Invalid config key column format (too many fields): '%s'"
 msgstr ""
 
-#: lxc/image.go:1196 lxc/list.go:386
+#: lxc/image.go:1195 lxc/list.go:386
 #, c-format
 msgid "Invalid format %q"
 msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/list.go:495
+#: lxc/list.go:495 lxc/storage_volume.go:971
 msgid "LOCATION"
 msgstr ""
 
@@ -1104,12 +1104,12 @@ msgstr ""
 msgid "LXD server isn't part of a cluster"
 msgstr ""
 
-#: lxc/image.go:844
+#: lxc/image.go:843
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:846
+#: lxc/image.go:845
 msgid "Last used: never"
 msgstr ""
 
@@ -1198,7 +1198,7 @@ msgid ""
 "  s - State\n"
 "  S - Number of snapshots\n"
 "  t - Type (persistent or ephemeral)\n"
-"  L - Location of the container (e.g. its node)\n"
+"  L - Location of the container (e.g. its cluster member)\n"
 "\n"
 "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
 "  KEY: The (extended) config key to display\n"
@@ -1220,11 +1220,11 @@ msgid ""
 "Filters may be part of the image hash or part of the image alias name.\n"
 msgstr ""
 
-#: lxc/image.go:889
+#: lxc/image.go:888
 msgid "List images"
 msgstr ""
 
-#: lxc/image.go:890
+#: lxc/image.go:889
 msgid ""
 "List images\n"
 "\n"
@@ -1388,6 +1388,16 @@ msgstr ""
 msgid "Manage trusted clients"
 msgstr ""
 
+#: lxc/cluster.go:268
+#, c-format
+msgid "Member %s removed"
+msgstr ""
+
+#: lxc/cluster.go:221
+#, c-format
+msgid "Member %s renamed to %s"
+msgstr ""
+
 #: lxc/info.go:201
 msgid "Memory (current)"
 msgstr ""
@@ -1509,10 +1519,6 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
-#: lxc/storage_volume.go:971
-msgid "NODE"
-msgstr ""
-
 #: lxc/info.go:125
 #, c-format
 msgid "Name: %s"
@@ -1530,7 +1536,7 @@ msgstr ""
 
 #: lxc/network.go:301
 #, c-format
-msgid "Network %s pending on node %s"
+msgid "Network %s pending on member %s"
 msgstr ""
 
 #: lxc/network.go:906
@@ -1575,20 +1581,6 @@ msgstr ""
 msgid "No value found in %q"
 msgstr ""
 
-#: lxc/cluster.go:268
-#, c-format
-msgid "Node %s removed"
-msgstr ""
-
-#: lxc/cluster.go:221
-#, c-format
-msgid "Node %s renamed to %s"
-msgstr ""
-
-#: lxc/copy.go:45 lxc/init.go:48 lxc/move.go:47
-msgid "Node name"
-msgstr ""
-
 #: lxc/storage_volume.go:164 lxc/storage_volume.go:243
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
@@ -1597,7 +1589,7 @@ msgstr ""
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:658
+#: lxc/image.go:657
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:924 lxc/remote.go:467
+#: lxc/image.go:923 lxc/remote.go:467
 msgid "PUBLIC"
 msgstr ""
 
@@ -1735,7 +1727,7 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:849
+#: lxc/image.go:848
 msgid "Properties:"
 msgstr ""
 
@@ -1743,7 +1735,7 @@ msgstr ""
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:827
+#: lxc/image.go:826
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -1764,11 +1756,11 @@ msgstr ""
 msgid "Recursively transfer files"
 msgstr ""
 
-#: lxc/image.go:1211 lxc/image.go:1212
+#: lxc/image.go:1210 lxc/image.go:1211
 msgid "Refresh images"
 msgstr ""
 
-#: lxc/image.go:1239
+#: lxc/image.go:1238
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
@@ -1912,7 +1904,7 @@ msgstr ""
 msgid "Run command against all containers"
 msgstr ""
 
-#: lxc/image.go:927
+#: lxc/image.go:926
 msgid "SIZE"
 msgstr ""
 
@@ -2045,7 +2037,7 @@ msgstr ""
 msgid "Show full device configuration for containers or profiles"
 msgstr ""
 
-#: lxc/image.go:1284 lxc/image.go:1285
+#: lxc/image.go:1283 lxc/image.go:1284
 msgid "Show image properties"
 msgstr ""
 
@@ -2101,7 +2093,7 @@ msgstr ""
 msgid "Show the used and free space in bytes"
 msgstr ""
 
-#: lxc/image.go:775 lxc/image.go:776
+#: lxc/image.go:774 lxc/image.go:775
 msgid "Show useful information about images"
 msgstr ""
 
@@ -2109,7 +2101,7 @@ msgstr ""
 msgid "Show useful information about storage pools"
 msgstr ""
 
-#: lxc/image.go:825
+#: lxc/image.go:824
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -2123,7 +2115,7 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:867
+#: lxc/image.go:866
 msgid "Source:"
 msgstr ""
 
@@ -2170,7 +2162,7 @@ msgstr ""
 
 #: lxc/storage.go:142
 #, c-format
-msgid "Storage pool %s pending on node %s"
+msgid "Storage pool %s pending on member %s"
 msgstr ""
 
 #: lxc/init.go:46
@@ -2270,7 +2262,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:828
+#: lxc/image.go:827
 msgid "Timestamps:"
 msgstr ""
 
@@ -2307,7 +2299,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:687
+#: lxc/image.go:686
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -2325,7 +2317,7 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:928
+#: lxc/image.go:927
 msgid "UPLOAD DATE"
 msgstr ""
 
@@ -2343,7 +2335,7 @@ msgstr ""
 msgid "Unable to create a temporary file: %v"
 msgstr ""
 
-#: lxc/image.go:943 lxc/list.go:520
+#: lxc/image.go:942 lxc/list.go:520
 #, c-format
 msgid "Unknown column shorthand char '%c' in '%s'"
 msgstr ""
@@ -2377,7 +2369,7 @@ msgstr ""
 msgid "Unset storage volume configuration keys"
 msgstr ""
 
-#: lxc/image.go:835
+#: lxc/image.go:834
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2604,7 +2596,7 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:819
+#: lxc/image.go:818
 msgid "disabled"
 msgstr ""
 
@@ -2648,7 +2640,7 @@ msgstr ""
 msgid "edit [<remote>:][<container>]"
 msgstr ""
 
-#: lxc/image.go:821
+#: lxc/image.go:820
 msgid "enabled"
 msgstr ""
 
@@ -2711,7 +2703,7 @@ msgstr ""
 msgid "info"
 msgstr ""
 
-#: lxc/image.go:774
+#: lxc/image.go:773
 msgid "info [<remote>:]<image>"
 msgstr ""
 
@@ -2740,7 +2732,7 @@ msgstr ""
 msgid "list [<remote>:]"
 msgstr ""
 
-#: lxc/image.go:887 lxc/list.go:45
+#: lxc/image.go:886 lxc/list.go:45
 msgid "list [<remote>:] [<filter>...]"
 msgstr ""
 
@@ -2983,7 +2975,7 @@ msgstr ""
 msgid "network"
 msgstr ""
 
-#: lxc/image.go:809 lxc/image.go:814 lxc/image.go:977
+#: lxc/image.go:808 lxc/image.go:813 lxc/image.go:976
 msgid "no"
 msgstr ""
 
@@ -3033,7 +3025,7 @@ msgstr ""
 msgid "query [<remote>:]<API path>"
 msgstr ""
 
-#: lxc/image.go:1210
+#: lxc/image.go:1209
 msgid "refresh [<remote>:]<image> [[<remote>:]<image>...]"
 msgstr ""
 
@@ -3149,7 +3141,7 @@ msgstr ""
 msgid "show [<remote>:]<container|profile>"
 msgstr ""
 
-#: lxc/image.go:1283
+#: lxc/image.go:1282
 msgid "show [<remote>:]<image>"
 msgstr ""
 
@@ -3266,6 +3258,6 @@ msgstr ""
 msgid "volume"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:811 lxc/image.go:816 lxc/image.go:975
+#: lxc/delete.go:46 lxc/image.go:810 lxc/image.go:815 lxc/image.go:974
 msgid "yes"
 msgstr ""