[lxc-devel] [lxd/master] Improved client help

stgraber on Github lxc-bot at linuxcontainers.org
Sun Mar 5 07:23:10 UTC 2017


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170305/2494b405/attachment.bin>
-------------- next part --------------
From c3e14f24df81240958401af09132269e1a7ef5b8 Mon Sep 17 00:00:00 2001
From: Weblate <noreply at weblate.org>
Date: Thu, 2 Mar 2017 00:50:57 +0000
Subject: [PATCH 01/29] Update translations from weblate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://hosted.weblate.org/projects/linux-containers/lxd/

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 po/de.po   |  8 ++++----
 po/el.po   |  8 ++++----
 po/fr.po   |  8 ++++----
 po/ja.po   | 18 +++++++++---------
 po/lxd.pot |  8 ++++----
 po/nl.po   |  8 ++++----
 po/ru.po   |  8 ++++----
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/po/de.po b/po/de.po
index 2332d6c..e23a60e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-02-28 23:57-0500\n"
+"POT-Creation-Date: 2017-03-05 02:20-0500\n"
 "PO-Revision-Date: 2017-02-14 17:11+0000\n"
 "Last-Translator: Tim Rose <tim at netlope.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -297,7 +297,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:398 lxc/profile.go:424 lxc/storage.go:541
+#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
 msgid "Cannot provide container name to list"
 msgstr ""
 
@@ -1345,7 +1345,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:451 lxc/remote.go:380
+#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
 #: lxc/storage.go:569 lxc/storage.go:649
 msgid "NAME"
 msgstr ""
@@ -1856,7 +1856,7 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:452 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
 msgid "USED BY"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 78e5678..c1e2800 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-02-28 23:57-0500\n"
+"POT-Creation-Date: 2017-03-05 02:20-0500\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -209,7 +209,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:398 lxc/profile.go:424 lxc/storage.go:541
+#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
 msgid "Cannot provide container name to list"
 msgstr ""
 
@@ -1080,7 +1080,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:451 lxc/remote.go:380
+#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
 #: lxc/storage.go:569 lxc/storage.go:649
 msgid "NAME"
 msgstr ""
@@ -1572,7 +1572,7 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:452 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
 msgid "USED BY"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index cf622ba..7fd7400 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-02-28 23:57-0500\n"
+"POT-Creation-Date: 2017-03-05 02:20-0500\n"
 "PO-Revision-Date: 2017-02-24 23:43+0000\n"
 "Last-Translator: Christophe CHAUVET <christophe.chauvet at gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -290,7 +290,7 @@ 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 actuellement."
 
-#: lxc/network.go:398 lxc/profile.go:424 lxc/storage.go:541
+#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
 msgid "Cannot provide container name to list"
 msgstr "Impossible de fournir le nom du conteneur à lister"
 
@@ -1579,7 +1579,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:451 lxc/remote.go:380
+#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
 #: lxc/storage.go:569 lxc/storage.go:649
 msgid "NAME"
 msgstr "NOM"
@@ -2098,7 +2098,7 @@ msgstr "DATE DE PUBLICATION"
 msgid "URL"
 msgstr "URL"
 
-#: lxc/network.go:437 lxc/profile.go:452 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
 msgid "USED BY"
 msgstr "UTILISÉ PAR"
 
diff --git a/po/ja.po b/po/ja.po
index c755397..98ca721 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-02-28 23:57-0500\n"
-"PO-Revision-Date: 2017-02-17 15:34+0000\n"
+"POT-Creation-Date: 2017-03-05 02:20-0500\n"
+"PO-Revision-Date: 2017-03-02 00:50+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
 "containers/lxd/ja/>\n"
@@ -208,7 +208,7 @@ msgstr "標準入力から読み込めません: %s"
 msgid "Can't unset key '%s', it's not currently set."
 msgstr "キー '%s' が指定されていないので削除できません。"
 
-#: lxc/network.go:398 lxc/profile.go:424 lxc/storage.go:541
+#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
 msgid "Cannot provide container name to list"
 msgstr "コンテナ名を取得できません"
 
@@ -1480,7 +1480,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "コンテナ名を指定する必要があります: "
 
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:451 lxc/remote.go:380
+#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
 #: lxc/storage.go:569 lxc/storage.go:649
 msgid "NAME"
 msgstr ""
@@ -1534,7 +1534,7 @@ msgstr "フィンガープリントが指定されていません。"
 
 #: lxc/storage.go:285 lxc/storage.go:369
 msgid "Only \"custom\" volumes can be attached to containers."
-msgstr ""
+msgstr "\"カスタム\" のボリュームのみがコンテナにアタッチできます。"
 
 #: lxc/remote.go:120
 msgid "Only https URLs are supported for simplestreams"
@@ -1546,7 +1546,7 @@ msgstr "リモートイメージのインポートは https:// のみをサポ
 
 #: lxc/network.go:330 lxc/network.go:457
 msgid "Only managed networks can be modified."
-msgstr ""
+msgstr "管理対象のネットワークのみ変更できます。"
 
 #: lxc/help.go:63 lxc/main.go:112
 msgid "Options:"
@@ -1838,9 +1838,9 @@ msgid "Snapshots:"
 msgstr "スナップショット:"
 
 #: lxc/action.go:133
-#, fuzzy, c-format
+#, c-format
 msgid "Some containers failed to %s"
-msgstr "コンテナの停止に失敗しました!"
+msgstr "一部のコンテナで %s が失敗しました"
 
 #: lxc/image.go:340
 msgid "Source:"
@@ -1999,7 +1999,7 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:452 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
 msgid "USED BY"
 msgstr ""
 
diff --git a/po/lxd.pot b/po/lxd.pot
index 27de218..7a4dbf3 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2017-02-28 23:57-0500\n"
+        "POT-Creation-Date: 2017-03-05 02:20-0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -199,7 +199,7 @@ msgstr  ""
 msgid   "Can't unset key '%s', it's not currently set."
 msgstr  ""
 
-#: lxc/network.go:398 lxc/profile.go:424 lxc/storage.go:541
+#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
 msgid   "Cannot provide container name to list"
 msgstr  ""
 
@@ -932,7 +932,7 @@ msgstr  ""
 msgid   "Must supply container name for: "
 msgstr  ""
 
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:451 lxc/remote.go:380 lxc/storage.go:569 lxc/storage.go:649
+#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380 lxc/storage.go:569 lxc/storage.go:649
 msgid   "NAME"
 msgstr  ""
 
@@ -1415,7 +1415,7 @@ msgstr  ""
 msgid   "URL"
 msgstr  ""
 
-#: lxc/network.go:437 lxc/profile.go:452 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
 msgid   "USED BY"
 msgstr  ""
 
diff --git a/po/nl.po b/po/nl.po
index 424bacb..eb9bea5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-02-28 23:57-0500\n"
+"POT-Creation-Date: 2017-03-05 02:20-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:398 lxc/profile.go:424 lxc/storage.go:541
+#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
 msgid "Cannot provide container name to list"
 msgstr ""
 
@@ -1074,7 +1074,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:451 lxc/remote.go:380
+#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
 #: lxc/storage.go:569 lxc/storage.go:649
 msgid "NAME"
 msgstr ""
@@ -1565,7 +1565,7 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:452 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
 msgid "USED BY"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 618fdcc..df0db4d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-02-28 23:57-0500\n"
+"POT-Creation-Date: 2017-03-05 02:20-0500\n"
 "PO-Revision-Date: 2017-02-14 09:54+0000\n"
 "Last-Translator: Vyacheslav Razykov <v.razykov at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -277,7 +277,7 @@ msgstr "Невозможно прочитать из стандартного в
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:398 lxc/profile.go:424 lxc/storage.go:541
+#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
 msgid "Cannot provide container name to list"
 msgstr "Невозможно добавить имя контейнера в список"
 
@@ -1158,7 +1158,7 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:451 lxc/remote.go:380
+#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
 #: lxc/storage.go:569 lxc/storage.go:649
 msgid "NAME"
 msgstr ""
@@ -1650,7 +1650,7 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:452 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
 msgid "USED BY"
 msgstr ""
 

From 1061b56b2d556a132c847163e7919f0fc9b97ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 3 Mar 2017 23:41:15 -0500
Subject: [PATCH 02/29] lxc: Make help/usage a bit more consistent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - Make sure that we always exit 0 when passed --help
 - Make sure that when exiting 0, the usage goes to stdout.
 - On error, make sure the usage goes to stderr.

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

diff --git a/lxc/main.go b/lxc/main.go
index 748f286..55f0b05 100644
--- a/lxc/main.go
+++ b/lxc/main.go
@@ -109,8 +109,12 @@ func run() error {
 	}
 	cmd.flags()
 	gnuflag.Usage = func() {
-		fmt.Fprintf(os.Stderr, i18n.G("Usage: %s")+"\n\n"+i18n.G("Options:")+"\n\n", strings.TrimSpace(cmd.usage()))
+		fmt.Print(cmd.usage())
+		fmt.Printf("\n\n%s\n", i18n.G("Options:"))
+
+		gnuflag.SetOut(os.Stdout)
 		gnuflag.PrintDefaults()
+		os.Exit(0)
 	}
 
 	os.Args = os.Args[1:]
@@ -145,7 +149,15 @@ func run() error {
 		if !*noAlias {
 			execIfAliases(config, origArgs)
 		}
-		fmt.Fprintf(os.Stderr, "%s\n\n"+i18n.G("error: %v")+"\n", cmd.usage(), err)
+
+		fmt.Fprintf(os.Stderr, i18n.G("error: %v"), err)
+		fmt.Fprintf(os.Stderr, "\n\n")
+		fmt.Fprint(os.Stderr, cmd.usage())
+		fmt.Fprintf(os.Stderr, "\n\n%s\n", i18n.G("Options:"))
+
+		gnuflag.SetOut(os.Stderr)
+		gnuflag.PrintDefaults()
+
 		os.Exit(1)
 	}
 	return err

From e95765d1559c35dd3444796a9550e12cd475c3ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 3 Mar 2017 23:45:48 -0500
Subject: [PATCH 03/29] lxc: Allow --version to be passed with any command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/main.go b/lxc/main.go
index 55f0b05..74aa14a 100644
--- a/lxc/main.go
+++ b/lxc/main.go
@@ -62,8 +62,8 @@ func run() error {
 		os.Args = append(os.Args, "--all")
 	}
 
-	if len(os.Args) == 2 && os.Args[1] == "--version" {
-		os.Args[1] = "version"
+	if shared.StringInSlice("--version", os.Args) {
+		os.Args = []string{os.Args[0], "version"}
 	}
 
 	if len(os.Args) == 2 && os.Args[1] == "--man" {

From b7b0ed07725b0aa2e04b1e5a9eba33fe26ad900a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:13:48 -0500
Subject: [PATCH 04/29] lxc: Rework for better manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit and the following ones for each individual command are
designed to improve the help messages from the lxc command line tool so
that help2man will generate proper manpages for us.

This includes adding a bunch of spacing to generate proper options,
better marking help sub-sections, ...

It also modifies "lxc manpage" so that instead of spitting out a mostly
useless wall of text, it will instead now generate proper manpages in
the specified directory.

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/main.go    | 78 ++++++++++++++++++++++++++++++++++------------------------
 lxc/manpage.go | 47 ++++++++++++++++++++++++-----------
 2 files changed, 79 insertions(+), 46 deletions(-)

diff --git a/lxc/main.go b/lxc/main.go
index 74aa14a..9570bff 100644
--- a/lxc/main.go
+++ b/lxc/main.go
@@ -16,8 +16,11 @@ import (
 )
 
 var configPath string
+var execName string
 
 func main() {
+	execName = os.Args[0]
+
 	if err := run(); err != nil {
 		msg := fmt.Sprintf(i18n.G("error: %v"), err)
 
@@ -66,10 +69,6 @@ func run() error {
 		os.Args = []string{os.Args[0], "version"}
 	}
 
-	if len(os.Args) == 2 && os.Args[1] == "--man" {
-		os.Args[1] = "manpage"
-	}
-
 	if len(os.Args) < 2 {
 		commands["help"].run(nil, nil)
 		os.Exit(1)
@@ -142,24 +141,35 @@ func run() error {
 	}
 
 	err = cmd.run(config, gnuflag.Args())
-	if err == errArgs {
-		/* If we got an error about invalid arguments, let's try to
-		 * expand this as an alias
-		 */
-		if !*noAlias {
-			execIfAliases(config, origArgs)
+	if err == errArgs || err == errUsage {
+		out := os.Stdout
+		if err == errArgs {
+			/* If we got an error about invalid arguments, let's try to
+			 * expand this as an alias
+			 */
+			if !*noAlias {
+				execIfAliases(config, origArgs)
+			}
+
+			out = os.Stderr
 		}
+		gnuflag.SetOut(out)
 
-		fmt.Fprintf(os.Stderr, i18n.G("error: %v"), err)
-		fmt.Fprintf(os.Stderr, "\n\n")
-		fmt.Fprint(os.Stderr, cmd.usage())
-		fmt.Fprintf(os.Stderr, "\n\n%s\n", i18n.G("Options:"))
+		if err == errArgs {
+			fmt.Fprintf(out, i18n.G("error: %v"), err)
+			fmt.Fprintf(out, "\n\n")
+		}
+		fmt.Fprint(out, cmd.usage())
+		fmt.Fprintf(out, "\n\n%s\n", i18n.G("Options:"))
 
-		gnuflag.SetOut(os.Stderr)
 		gnuflag.PrintDefaults()
 
-		os.Exit(1)
+		if err == errArgs {
+			os.Exit(1)
+		}
+		os.Exit(0)
 	}
+
 	return err
 }
 
@@ -188,33 +198,36 @@ var commands = map[string]command{
 	"move":    &moveCmd{},
 	"network": &networkCmd{},
 	"pause": &actionCmd{
-		action:         shared.Freeze,
-		name:           "pause",
-		additionalHelp: i18n.G("The opposite of `lxc pause` is `lxc start`."),
+		action:      shared.Freeze,
+		description: i18n.G("Pause containers."),
+		name:        "pause",
 	},
 	"profile": &profileCmd{},
 	"publish": &publishCmd{},
 	"remote":  &remoteCmd{},
 	"restart": &actionCmd{
-		action:     shared.Restart,
-		hasTimeout: true,
-		visible:    true,
-		name:       "restart",
-		timeout:    -1,
+		action:      shared.Restart,
+		description: i18n.G("Restart containers."),
+		hasTimeout:  true,
+		visible:     true,
+		name:        "restart",
+		timeout:     -1,
 	},
 	"restore":  &restoreCmd{},
 	"snapshot": &snapshotCmd{},
 	"start": &actionCmd{
-		action:  shared.Start,
-		visible: true,
-		name:    "start",
+		action:      shared.Start,
+		description: i18n.G("Start containers."),
+		visible:     true,
+		name:        "start",
 	},
 	"stop": &actionCmd{
-		action:     shared.Stop,
-		hasTimeout: true,
-		visible:    true,
-		name:       "stop",
-		timeout:    -1,
+		action:      shared.Stop,
+		description: i18n.G("Stop containers."),
+		hasTimeout:  true,
+		visible:     true,
+		name:        "stop",
+		timeout:     -1,
 	},
 	"storage": &storageCmd{},
 	"version": &versionCmd{},
@@ -247,6 +260,7 @@ var defaultAliases = map[string]string{
 }
 
 var errArgs = fmt.Errorf(i18n.G("wrong number of subcommand arguments"))
+var errUsage = fmt.Errorf("show usage")
 
 func findAlias(aliases map[string]string, origArgs []string) ([]string, []string, bool) {
 	foundAlias := false
diff --git a/lxc/manpage.go b/lxc/manpage.go
index 084ae0a..5dc07c1 100644
--- a/lxc/manpage.go
+++ b/lxc/manpage.go
@@ -2,7 +2,9 @@ package main
 
 import (
 	"fmt"
-	"sort"
+	"os"
+	"os/exec"
+	"path/filepath"
 
 	"github.com/lxc/lxd"
 	"github.com/lxc/lxd/shared/i18n"
@@ -16,32 +18,49 @@ func (c *manpageCmd) showByDefault() bool {
 
 func (c *manpageCmd) usage() string {
 	return i18n.G(
-		`Print all the subcommands help.`)
+		`Usage: lxc manpage <directory>
+
+Generate all the LXD manpages.`)
 }
 
 func (c *manpageCmd) flags() {
 }
 
 func (c *manpageCmd) run(_ *lxd.Config, args []string) error {
-	if len(args) > 0 {
+	if len(args) != 1 {
 		return errArgs
 	}
 
-	keys := []string{}
-	for k := range commands {
-		keys = append(keys, k)
+	_, err := exec.LookPath("help2man")
+	if err != nil {
+		return fmt.Errorf(i18n.G("Unable to find help2man."))
 	}
-	sort.Strings(keys)
 
-	header := false
-	for _, k := range keys {
-		if header {
-			fmt.Printf("\n\n")
+	help2man := func(command string, title string, path string) error {
+		target, err := os.Create(path)
+		if err != nil {
+			return err
 		}
+		defer target.Close()
+
+		cmd := exec.Command("help2man", command, "-n", title, "--no-info")
+		cmd.Stdout = target
+
+		return cmd.Run()
+	}
 
-		fmt.Printf("### lxc %s\n", k)
-		commands["help"].run(nil, []string{k})
-		header = true
+	// Generate the main manpage
+	err = help2man(execName, "LXD - client", filepath.Join(args[0], fmt.Sprintf("lxc.1")))
+	if err != nil {
+		return fmt.Errorf(i18n.G("Failed to generate 'lxc.1': %v"), err)
+	}
+
+	// Generate the pages for the subcommands
+	for k, cmd := range commands {
+		err := help2man(fmt.Sprintf("%s %s", execName, k), summaryLine(cmd.usage()), filepath.Join(args[0], fmt.Sprintf("lxc.%s.1", k)))
+		if err != nil {
+			return fmt.Errorf(i18n.G("Failed to generate 'lxc.%s.1': %v"), k, err)
+		}
 	}
 
 	return nil

From 95cd579563886b436c0b77739da3e7e1c043c08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:41 -0500
Subject: [PATCH 05/29] lxc/action: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/action.go b/lxc/action.go
index 3f465aa..d545cbb 100644
--- a/lxc/action.go
+++ b/lxc/action.go
@@ -13,15 +13,15 @@ import (
 )
 
 type actionCmd struct {
-	action         shared.ContainerAction
-	hasTimeout     bool
-	visible        bool
-	name           string
-	timeout        int
-	force          bool
-	stateful       bool
-	stateless      bool
-	additionalHelp string
+	action      shared.ContainerAction
+	description string
+	hasTimeout  bool
+	visible     bool
+	name        string
+	timeout     int
+	force       bool
+	stateful    bool
+	stateless   bool
 }
 
 func (c *actionCmd) showByDefault() bool {
@@ -29,14 +29,15 @@ func (c *actionCmd) showByDefault() bool {
 }
 
 func (c *actionCmd) usage() string {
-	if c.additionalHelp != "" {
-		c.additionalHelp = fmt.Sprintf("\n\n%s", c.additionalHelp)
+	extra := ""
+	if c.name == "pause" {
+		extra = "\n" + i18n.G("The opposite of \"lxc pause\" is \"lxc start\".")
 	}
 
 	return fmt.Sprintf(i18n.G(
-		`Change state of one or more containers to %s.
+		`Usage: lxc %s [<remote>:]<container> [[<remote>:]<container>...]
 
-lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s`), c.name, c.name, c.additionalHelp)
+%s%s`), c.name, c.description, extra)
 }
 
 func (c *actionCmd) flags() {

From 96b944b81bf9502a3302d3b6eeda67c835878cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:45 -0500
Subject: [PATCH 06/29] lxc/config: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/config.go b/lxc/config.go
index ce79c9e..7be59ac 100644
--- a/lxc/config.go
+++ b/lxc/config.go
@@ -56,41 +56,77 @@ func (c *configCmd) configEditHelp() string {
 
 func (c *configCmd) usage() string {
 	return i18n.G(
-		`Manage configuration.
-
-lxc config device add [<remote>:]<container> <device> <type> [key=value...]   Add a device to a container.
-lxc config device get [<remote>:]<container> <device> <key>                   Get a device property.
-lxc config device set [<remote>:]<container> <device> <key> <value>           Set a device property.
-lxc config device unset [<remote>:]<container> <device> <key>                 Unset a device property.
-lxc config device list [<remote>:]<container>                                 List devices for container.
-lxc config device show [<remote>:]<container>                                 Show full device details for container.
-lxc config device remove [<remote>:]<container> <name>                        Remove device from container.
-
-lxc config get [<remote>:][container] <key>                                   Get container or server configuration key.
-lxc config set [<remote>:][container] <key> <value>                           Set container or server configuration key.
-lxc config unset [<remote>:][container] <key>                                 Unset container or server configuration key.
-lxc config show [<remote>:][container] [--expanded]                           Show container or server configuration.
-lxc config edit [<remote>:][container]                                        Edit container or server configuration in external editor.
+		`Usage: lxc config <subcommand> [options]
+
+Change container or server configuration options.
+
+*Container configuration*
+
+lxc config get [<remote>:][container] <key>
+    Get container or server configuration key.
+
+lxc config set [<remote>:][container] <key> <value>
+    Set container or server configuration key.
+
+lxc config unset [<remote>:][container] <key>
+    Unset container or server configuration key.
+
+lxc config show [<remote>:][container] [--expanded]
+    Show container or server configuration.
+
+lxc config edit [<remote>:][container]
     Edit configuration, either by launching external editor or reading STDIN.
-    Example: lxc config edit <container> # launch editor
-             cat config.yaml | lxc config edit <container> # read from config.yaml
 
-lxc config trust list [<remote>:]                                             List all trusted certs.
-lxc config trust add [<remote>:] <certfile.crt>                               Add certfile.crt to trusted hosts.
-lxc config trust remove [<remote>:] [hostname|fingerprint]                    Remove the cert from trusted hosts.
+*Device management*
+
+lxc config device add [<remote>:]<container> <device> <type> [key=value...]
+    Add a device to a container.
+
+lxc config device get [<remote>:]<container> <device> <key>
+    Get a device property.
+
+lxc config device set [<remote>:]<container> <device> <key> <value>
+    Set a device property.
+
+lxc config device unset [<remote>:]<container> <device> <key>
+    Unset a device property.
 
-Examples:
-To mount host's /share/c1 onto /opt in the container:
-    lxc config device add [<remote>:]container1 <device-name> disk source=/share/c1 path=opt
+lxc config device list [<remote>:]<container>
+    List devices for container.
 
-To set an lxc config value:
-    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = 1'
+lxc config device show [<remote>:]<container>
+    Show full device details for container.
 
-To listen on IPv4 and IPv6 port 8443 (you can omit the 8443 its the default):
-    lxc config set core.https_address [::]:8443
+lxc config device remove [<remote>:]<container> <name>
+    Remove device from container.
 
-To set the server trust password:
-    lxc config set core.trust_password blah`)
+*Client trust store management*
+
+lxc config trust list [<remote>:]
+    List all trusted certs.
+
+lxc config trust add [<remote>:] <certfile.crt>
+    Add certfile.crt to trusted hosts.
+
+lxc config trust remove [<remote>:] [hostname|fingerprint]
+    Remove the cert from trusted hosts.
+
+*Examples*
+
+cat config.yaml | lxc config edit <container>
+    Update the container configuration from config.yaml.
+
+lxc config device add [<remote>:]container1 <device-name> disk source=/share/c1 path=opt
+    Will mount the host's /share/c1 onto /opt in the container.
+
+lxc config set [<remote>:]<container> limits.cpu 2
+    Will set a CPU limit of "2" for the container.
+
+lxc config set core.https_address [::]:8443
+    Will have LXD listen on IPv4 and IPv6 port 8443.
+
+lxc config set core.trust_password blah
+    Will set the server's trust password to blah.`)
 }
 
 func (c *configCmd) doSet(config *lxd.Config, args []string, unset bool) error {
@@ -133,7 +169,7 @@ func (c *configCmd) doSet(config *lxd.Config, args []string, unset bool) error {
 
 func (c *configCmd) run(config *lxd.Config, args []string) error {
 	if len(args) < 1 {
-		return errArgs
+		return errUsage
 	}
 
 	switch args[0] {

From 3d31f3b3e24675c6cf2d1c6e2931c1c104975cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:45 -0500
Subject: [PATCH 07/29] lxc/copy: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/copy.go b/lxc/copy.go
index efdb155..539d616 100644
--- a/lxc/copy.go
+++ b/lxc/copy.go
@@ -23,9 +23,9 @@ func (c *copyCmd) showByDefault() bool {
 
 func (c *copyCmd) usage() string {
 	return i18n.G(
-		`Copy containers within or in between LXD instances.
+		`Usage: lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]
 
-lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]`)
+Copy containers within or in between LXD instances.`)
 }
 
 func (c *copyCmd) flags() {

From 65ac67ea5e8a141dc1420a8fc61fe0ce12c6bef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:45 -0500
Subject: [PATCH 08/29] lxc/delete: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/delete.go b/lxc/delete.go
index 6900fb3..efe565f 100644
--- a/lxc/delete.go
+++ b/lxc/delete.go
@@ -24,11 +24,9 @@ func (c *deleteCmd) showByDefault() bool {
 
 func (c *deleteCmd) usage() string {
 	return i18n.G(
-		`Delete containers or snapshots.
+		`Usage: lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/<snapshot>]...]
 
-lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/<snapshot>]...]
-
-Destroy containers or snapshots with any attached data (configuration, snapshots, ...).`)
+Delete containers and snapshots.`)
 }
 
 func (c *deleteCmd) flags() {

From 3b8163ea10e5c6071e0f89dcba3255d0c48f523f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:45 -0500
Subject: [PATCH 09/29] lxc/exec: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/exec.go b/lxc/exec.go
index bc01995..8596d6f 100644
--- a/lxc/exec.go
+++ b/lxc/exec.go
@@ -44,9 +44,9 @@ func (c *execCmd) showByDefault() bool {
 
 func (c *execCmd) usage() string {
 	return i18n.G(
-		`Execute the specified command in a container.
+		`Usage: lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--env KEY=VALUE...] [--] <command line>
 
-lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--env KEY=VALUE...] [--] <command line>
+Execute commands in containers.
 
 Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored).`)
 }

From 87ebb19cf89fa243303ea678c55fcc260ce47679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:45 -0500
Subject: [PATCH 10/29] lxc/file: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/file.go b/lxc/file.go
index 73ef2c9..b5bd93e 100644
--- a/lxc/file.go
+++ b/lxc/file.go
@@ -34,21 +34,28 @@ func (c *fileCmd) showByDefault() bool {
 
 func (c *fileCmd) usage() string {
 	return i18n.G(
-		`Manage files in a container.
+		`Usage: lxc file <subcommand> [options]
 
-lxc file pull [-r|--recursive] [<remote>:]<container> [[<remote>:]<container>...] <target path>
-lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--mode=MODE] <source path> [<source path>...] [<remote>:]<container>
-lxc file delete [<remote>:]<container> [[<remote>:]<container>...]
-lxc file edit [<remote>:]<container>/<path>
+Manage files in containers.
+
+lxc file pull [-r|--recursive] [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] <target path>
+    Pull files from containers.
+
+lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--mode=MODE] <source path> [<source path>...] [<remote>:]<container>/<path>
+    Push files into containers.
 
-<source> in the case of pull, <target> in the case of push and <file> in the case of edit are <container name>/<path>
+lxc file delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]
+    Delete files in containers.
 
-Examples:
-To push /etc/hosts into the container foo:
-    lxc file push /etc/hosts foo/etc/hosts
+lxc file edit [<remote>:]<container>/<path>
+    Edit files in containers using the default text editor.
+
+*Examples*
+lxc file push /etc/hosts foo/etc/hosts
+   To push /etc/hosts into the container "foo".
 
-To pull /etc/hosts from the container:
-    lxc file pull foo/etc/hosts .`)
+lxc file pull foo/etc/hosts .
+   To pull /etc/hosts from the container and write it to the current directory.`)
 }
 
 func (c *fileCmd) flags() {
@@ -409,7 +416,7 @@ func (c *fileCmd) edit(config *lxd.Config, args []string) error {
 
 func (c *fileCmd) run(config *lxd.Config, args []string) error {
 	if len(args) < 1 {
-		return errArgs
+		return errUsage
 	}
 
 	switch args[0] {

From 339edcc9f495646aa92447d464f3f0eae1b5a974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:45 -0500
Subject: [PATCH 11/29] lxc/finger: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/finger.go b/lxc/finger.go
index af1e28b..ed19295 100644
--- a/lxc/finger.go
+++ b/lxc/finger.go
@@ -13,9 +13,9 @@ func (c *fingerCmd) showByDefault() bool {
 
 func (c *fingerCmd) usage() string {
 	return i18n.G(
-		`Check if the LXD instance is up.
+		`Usage: lxc finger [<remote>:]
 
-lxc finger [<remote>:]`)
+Check if the LXD server is alive.`)
 }
 
 func (c *fingerCmd) flags() {}

From 2c2fb16bc260f779f4cb7a3323bf97b11c30daae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:45 -0500
Subject: [PATCH 12/29] lxc/help: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/help.go b/lxc/help.go
index 589e962..27f0a82 100644
--- a/lxc/help.go
+++ b/lxc/help.go
@@ -1,12 +1,9 @@
 package main
 
 import (
-	"bufio"
-	"bytes"
 	"fmt"
 	"os"
 	"sort"
-	"strings"
 
 	"github.com/lxc/lxd"
 	"github.com/lxc/lxd/shared/gnuflag"
@@ -23,9 +20,9 @@ func (c *helpCmd) showByDefault() bool {
 
 func (c *helpCmd) usage() string {
 	return i18n.G(
-		`Help page for the LXD client.
+		`Usage: lxc help [--all]
 
-lxc help [--all]`)
+Help page for the LXD client.`)
 }
 
 func (c *helpCmd) flags() {
@@ -46,43 +43,40 @@ func (c *helpCmd) run(config *lxd.Config, args []string) error {
 	}
 
 	fmt.Println(i18n.G("Usage: lxc <command> [options]"))
-	fmt.Println(i18n.G("Available commands:"))
+	fmt.Println()
+	fmt.Println(i18n.G(`This is the LXD command line client.
+
+All of LXD's features can be driven through the various commands below.
+For help with any of those, simply call them with --help.`))
+	fmt.Println()
+
+	fmt.Println(i18n.G("Commands:"))
 	var names []string
 	for name := range commands {
 		names = append(names, name)
 	}
 	sort.Strings(names)
 	for _, name := range names {
+		if name == "help" {
+			continue
+		}
+
 		cmd := commands[name]
 		if c.showAll || cmd.showByDefault() {
-			fmt.Printf("\t%-10s - %s\n", name, c.summaryLine(cmd.usage()))
+			fmt.Printf("  %-16s %s\n", name, summaryLine(cmd.usage()))
 		}
 	}
-	if !c.showAll {
-		fmt.Println()
-		fmt.Println(i18n.G("Options:"))
-		fmt.Println("  --all              " + i18n.G("Print less common commands"))
-		fmt.Println("  --debug            " + i18n.G("Print debug information"))
-		fmt.Println("  --verbose          " + i18n.G("Print verbose information"))
-		fmt.Println("  --version          " + i18n.G("Show client version"))
-		fmt.Println()
-		fmt.Println(i18n.G("Environment:"))
-		fmt.Println("  LXD_CONF           " + i18n.G("Path to an alternate client configuration directory"))
-		fmt.Println("  LXD_DIR            " + i18n.G("Path to an alternate server directory"))
-	}
-	return nil
-}
 
-// summaryLine returns the first line of the help text. Conventionally, this
-// should be a one-line command summary, potentially followed by a longer
-// explanation.
-func (c *helpCmd) summaryLine(usage string) string {
-	usage = strings.TrimSpace(usage)
-	s := bufio.NewScanner(bytes.NewBufferString(usage))
-	if s.Scan() {
-		if len(s.Text()) > 1 {
-			return s.Text()
-		}
-	}
-	return i18n.G("Missing summary.")
+	fmt.Println()
+	fmt.Println(i18n.G("Options:"))
+	fmt.Println("  --all            " + i18n.G("Print less common commands"))
+	fmt.Println("  --debug          " + i18n.G("Print debug information"))
+	fmt.Println("  --verbose        " + i18n.G("Print verbose information"))
+	fmt.Println("  --version        " + i18n.G("Show client version"))
+	fmt.Println()
+	fmt.Println(i18n.G("Environment:"))
+	fmt.Println("  LXD_CONF         " + i18n.G("Path to an alternate client configuration directory"))
+	fmt.Println("  LXD_DIR          " + i18n.G("Path to an alternate server directory"))
+
+	return nil
 }

From 870241753cd7f391efed8dca3e7491ac1fdd8553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:46 -0500
Subject: [PATCH 13/29] lxc/image: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/image.go b/lxc/image.go
index 500c0ee..ba47e98 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -60,7 +60,9 @@ func (c *imageCmd) imageEditHelp() string {
 
 func (c *imageCmd) usage() string {
 	return i18n.G(
-		`Manipulate container images.
+		`Usage: lxc image <subcommand> [options]
+
+Manipulate container images.
 
 In LXD containers are created from images. Those images were themselves
 either generated from an existing container or downloaded from an image
@@ -206,7 +208,7 @@ func (c *imageCmd) run(config *lxd.Config, args []string) error {
 	var remote string
 
 	if len(args) < 1 {
-		return errArgs
+		return errUsage
 	}
 
 	switch args[0] {

From 4c5a2e083a70a85b70205c108dcd879da8b771b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:46 -0500
Subject: [PATCH 14/29] lxc/info: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/info.go b/lxc/info.go
index 31f46f2..80ce795 100644
--- a/lxc/info.go
+++ b/lxc/info.go
@@ -23,13 +23,15 @@ func (c *infoCmd) showByDefault() bool {
 
 func (c *infoCmd) usage() string {
 	return i18n.G(
-		`List information on LXD servers and containers.
+		`Usage: lxc info [<remote>:][<container>] [--show-log]
 
-For a container:
-    lxc info [<remote:>]<container> [--show-log]
+Show container or server information.
 
-For a server:
-    lxc info [<remote:>]`)
+lxc info [<remote>:]<container> [--show-log]
+    For container information.
+
+lxc info [<remote>:]
+    For LXD server information.`)
 }
 
 func (c *infoCmd) flags() {

From 93e5ec5394d00a19b438f81e24f382507628e32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:46 -0500
Subject: [PATCH 15/29] lxc/init: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/init.go b/lxc/init.go
index 0203e84..85e8369 100644
--- a/lxc/init.go
+++ b/lxc/init.go
@@ -73,16 +73,14 @@ func (c *initCmd) showByDefault() bool {
 
 func (c *initCmd) usage() string {
 	return i18n.G(
-		`Initialize a container from a particular image.
+		`Usage: lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--storage|-s <pool>]
 
-lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--storage|-s <pool>]
-
-Initializes a container using the specified image and name.
+Create containers from images.
 
 Not specifying -p will result in the default profile.
 Specifying "-p" with no argument will result in no profile.
 
-Example:
+Examples:
     lxc init ubuntu:16.04 u1`)
 }
 

From 85d6e01af698f3648c8eb6fcc5eab3ac8de85f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:46 -0500
Subject: [PATCH 16/29] lxc/launch: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/launch.go b/lxc/launch.go
index 299e26e..2a5b35e 100644
--- a/lxc/launch.go
+++ b/lxc/launch.go
@@ -21,16 +21,14 @@ func (c *launchCmd) showByDefault() bool {
 
 func (c *launchCmd) usage() string {
 	return i18n.G(
-		`Launch a container from a particular image.
+		`Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--storage|-s <pool>]
 
-lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--storage|-s <pool>]
-
-Launches a container using the specified image and name.
+Create and start containers from images.
 
 Not specifying -p will result in the default profile.
 Specifying "-p" with no argument will result in no profile.
 
-Example:
+Examples:
     lxc launch ubuntu:16.04 u1`)
 }
 

From 51f6159e9bd2bc98aeb526d595f072d9b2832b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:46 -0500
Subject: [PATCH 17/29] lxc/list: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/list.go b/lxc/list.go
index 294367b..e0d8b14 100644
--- a/lxc/list.go
+++ b/lxc/list.go
@@ -45,63 +45,87 @@ func (c *listCmd) showByDefault() bool {
 
 func (c *listCmd) usage() string {
 	return i18n.G(
-		`Lists the containers.
+		`Usage: lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--fast]
 
-lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--fast]
+List the existing containers.
 
-The filters are:
-* A single keyword like "web" which will list any container with a name starting by "web".
-* A regular expression on the container name. (e.g. .*web.*01$)
-* A key/value pair referring to a configuration item. For those, the namespace can be abbreviated to the smallest unambiguous identifier:
- * "user.blah=abc" will list all containers with the "blah" user property set to "abc".
- * "u.blah=abc" will do the same
- * "security.privileged=1" will list all privileged containers
- * "s.privileged=1" will do the same
-* A regular expression matching a configuration item or its value. (e.g. volatile.eth0.hwaddr=00:16:3e:.*)
+Default column layout: ns46tS
+Fast column layout: nsacPt
+
+*Filters*
+A single keyword like "web" which will list any container with a name starting by "web".
+
+A regular expression on the container name. (e.g. .*web.*01$).
+
+A key/value pair referring to a configuration item. For those, the namespace can be abbreviated to the smallest unambiguous identifier.
+    - "user.blah=abc" will list all containers with the "blah" user property set to "abc".
+
+    - "u.blah=abc" will do the same
+
+    - "security.privileged=1" will list all privileged containers
+
+    - "s.privileged=1" will do the same
 
+A regular expression matching a configuration item or its value. (e.g. volatile.eth0.hwaddr=00:16:3e:.*).
+
+*Columns*
 The -c option takes a comma separated list of arguments that control
 which container attributes to output when displaying in table format.
+
 Column arguments are either pre-defined shorthand chars (see below),
-or (extended) config keys.  Commas between consecutive shorthand chars
-are optional.
-
-Pre-defined shorthand chars:
-* 4 - IPv4 address
-* 6 - IPv6 address
-* a - architecture
-* b - storage pool
-* c - creation date
-* l - last used date
-* n - name
-* p - pid of container init process
-* P - profiles
-* s - state
-* S - number of snapshots
-* t - type (persistent or ephemeral)
-
-Config key syntax: key[:name][:maxWidth]
-* key      - The (extended) config key to display
-* name     - Name to display in the column header, defaults to the key
-             if not specified or if empty (to allow defining maxWidth
-             without a custom name, e.g. user.key::0)
-* maxWidth - Max width of the column (longer results are truncated).
-             -1 == unlimited
-              0 == width of column header
-             >0 == max width in chars
-             Default is -1 (unlimited)
+or (extended) config keys.
 
-Default column layout: ns46tS
-Fast column layout: nsacPt
+Commas between consecutive shorthand chars are optional.
+
+Pre-defined column shorthand chars:
+
+    4 - IPv4 address
+
+    6 - IPv6 address
+
+    a - Architecture
+
+    b - Storage pool
+
+    c - Creation date
+
+    l - Last used date
+
+    n - Name
+
+    p - PID of the container's init process
+
+    P - Profiles
+
+    s - State
+
+    S - Number of snapshots
+
+    t - Type (persistent or ephemeral)
+
+Custom columns are defined with "key[:name][:maxWidth]":
+
+    KEY: The (extended) config key to display
+
+    NAME: Name to display in the column header.
+    Defaults to the key if not specified or empty.
+
+    MAXWIDTH: Max width of the column (longer results are truncated).
+    Defaults to -1 (unlimited). Use 0 to limit to the column header size.
+
+*Examples*
+lxc list -c n,volatile.base_image:"BASE IMAGE":0,s46,volatile.eth0.hwaddr:MAC
+    Shows a list of containers using the "NAME", "BASE IMAGE", "STATE", "IPV4",
+    "IPV6" and "MAC" columns.
 
-Example:
-    lxc list -c n,volatile.base_image:"BASE IMAGE":0,s46,volatile.eth0.hwaddr:MAC`)
+    "BASE IMAGE" and "MAC" are custom columns generated from container configuration keys.`)
 }
 
 func (c *listCmd) flags() {
 	gnuflag.StringVar(&c.columnsRaw, "c", "ns46tS", i18n.G("Columns"))
 	gnuflag.StringVar(&c.columnsRaw, "columns", "ns46tS", i18n.G("Columns"))
 	gnuflag.StringVar(&c.format, "format", "table", i18n.G("Format"))
-	gnuflag.BoolVar(&c.fast, "fast", false, i18n.G("Fast mode (same as --columns=nsacPt"))
+	gnuflag.BoolVar(&c.fast, "fast", false, i18n.G("Fast mode (same as --columns=nsacPt)"))
 }
 
 // This seems a little excessive.

From f08f14b47c9c11a3df158f5eba8464af68b9cb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:46 -0500
Subject: [PATCH 18/29] lxc/monitor: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/monitor.go b/lxc/monitor.go
index 74e3306..3b5d1b8 100644
--- a/lxc/monitor.go
+++ b/lxc/monitor.go
@@ -39,17 +39,17 @@ func (c *monitorCmd) showByDefault() bool {
 
 func (c *monitorCmd) usage() string {
 	return i18n.G(
-		`Monitor activity on the LXD server.
+		`Usage: lxc monitor [<remote>:] [--type=TYPE...]
 
-lxc monitor [<remote>:] [--type=TYPE...]
+Monitor a local or remote LXD server.
 
-Connects to the monitoring interface of the specified LXD server.
+By default the monitor will listen to all message types.
 
-By default will listen to all message types.
-Specific types to listen to can be specified with --type.
+Message types to listen for can be specified with --type.
 
-Example:
-    lxc monitor --type=logging`)
+*Examples*
+lxc monitor --type=logging
+    Only show log message.`)
 }
 
 func (c *monitorCmd) flags() {

From 7d001403c4fa7fa8cf562ed1807a22615e2a0bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:47 -0500
Subject: [PATCH 19/29] lxc/move: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/move.go b/lxc/move.go
index d740db5..112d2a7 100644
--- a/lxc/move.go
+++ b/lxc/move.go
@@ -14,7 +14,9 @@ func (c *moveCmd) showByDefault() bool {
 
 func (c *moveCmd) usage() string {
 	return i18n.G(
-		`Move containers within or in between lxd instances.
+		`Usage: lxc move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/<snapshot>]]
+
+Move containers within or in between LXD instances.
 
 lxc move [<remote>:]<source container> [<remote>:][<destination container>]
     Move a container between two hosts, renaming it if destination name differs.

From c2577c921412fe73193e8c12358e0d197be3fefd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:47 -0500
Subject: [PATCH 20/29] lxc/network: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/network.go b/lxc/network.go
index 9e890d7..920a67e 100644
--- a/lxc/network.go
+++ b/lxc/network.go
@@ -47,32 +47,56 @@ func (c *networkCmd) networkEditHelp() string {
 
 func (c *networkCmd) usage() string {
 	return i18n.G(
-		`Manage networks.
-
-lxc network list [<remote>:]                              List available networks.
-lxc network show [<remote>:]<network>                     Show details of a network.
-lxc network create [<remote>:]<network> [key=value...]    Create a network.
-lxc network get [<remote>:]<network> <key>                Get network configuration.
-lxc network set [<remote>:]<network> <key> <value>        Set network configuration.
-lxc network unset [<remote>:]<network> <key>              Unset network configuration.
-lxc network delete [<remote>:]<network>                   Delete a network.
+		`Usage: lxc network <subcommand> [options]
+
+Manage and attach containers to networks.
+
+lxc network list [<remote>:]
+    List available networks.
+
+lxc network show [<remote>:]<network>
+    Show details of a network.
+
+lxc network create [<remote>:]<network> [key=value...]
+    Create a network.
+
+lxc network get [<remote>:]<network> <key>
+    Get network configuration.
+
+lxc network set [<remote>:]<network> <key> <value>
+    Set network configuration.
+
+lxc network unset [<remote>:]<network> <key>
+    Unset network configuration.
+
+lxc network delete [<remote>:]<network>
+    Delete a network.
+
 lxc network edit [<remote>:]<network>
     Edit network, either by launching external editor or reading STDIN.
-    Example: lxc network edit <network> # launch editor
-             cat network.yaml | lxc network edit <network> # read from network.yaml
 
 lxc network attach [<remote>:]<network> <container> [device name] [interface name]
+    Attach a network interface connecting the network to a specified container.
+
 lxc network attach-profile [<remote>:]<network> <profile> [device name] [interface name]
+    Attach a network interface connecting the network to a specified profile.
 
 lxc network detach [<remote>:]<network> <container> [device name]
-lxc network detach-profile [<remote>:]<network> <container> [device name]`)
+    Remove a network interface connecting the network to a specified container.
+
+lxc network detach-profile [<remote>:]<network> <container> [device name]
+    Remove a network interface connecting the network to a specified profile.
+
+*Examples*
+cat network.yaml | lxc network edit <network>
+    Update a network using the content of network.yaml`)
 }
 
 func (c *networkCmd) flags() {}
 
 func (c *networkCmd) run(config *lxd.Config, args []string) error {
 	if len(args) < 1 {
-		return errArgs
+		return errUsage
 	}
 
 	if args[0] == "list" {

From a506f1ed92f2d58043cbeebb2db9adee86b6c212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:47 -0500
Subject: [PATCH 21/29] lxc/profile: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/profile.go b/lxc/profile.go
index 7e79e23..70221a4 100644
--- a/lxc/profile.go
+++ b/lxc/profile.go
@@ -47,50 +47,89 @@ func (c *profileCmd) profileEditHelp() string {
 
 func (c *profileCmd) usage() string {
 	return i18n.G(
-		`Manage configuration profiles.
-
-lxc profile list [<remote>:]                                    List available profiles.
-lxc profile show [<remote>:]<profile>                           Show details of a profile.
-lxc profile create [<remote>:]<profile>                         Create a profile.
-lxc profile copy [<remote>:]<profile> [<remote>:]<profile>      Copy the profile.
-lxc profile get [<remote>:]<profile> <key>                      Get profile configuration.
-lxc profile set [<remote>:]<profile> <key> <value>              Set profile configuration.
-lxc profile unset [<remote>:]<profile> <key>                    Unset profile configuration.
-lxc profile delete [<remote>:]<profile>                         Delete a profile.
+		`Usage: lxc profile <subcommand> [options]
+
+Manage container configuration profiles.
+
+*Profile configuration*
+lxc profile list [<remote>:]
+    List available profiles.
+
+lxc profile show [<remote>:]<profile>
+    Show details of a profile.
+
+lxc profile create [<remote>:]<profile>
+    Create a profile.
+
+lxc profile copy [<remote>:]<profile> [<remote>:]<profile>
+    Copy the profile.
+
+lxc profile get [<remote>:]<profile> <key>
+    Get profile configuration.
+
+lxc profile set [<remote>:]<profile> <key> <value>
+    Set profile configuration.
+
+lxc profile unset [<remote>:]<profile> <key>
+    Unset profile configuration.
+
+lxc profile delete [<remote>:]<profile>
+    Delete a profile.
+
 lxc profile edit [<remote>:]<profile>
     Edit profile, either by launching external editor or reading STDIN.
-    Example: lxc profile edit <profile> # launch editor
-             cat profile.yaml | lxc profile edit <profile> # read from profile.yaml
 
+*Profile assignment*
 lxc profile assign [<remote>:]<container> <profiles>
-    Assign a comma-separated list of profiles to a container, in order.
-    All profiles passed in this call (and only those) will be applied
-    to the specified container, i.e. it sets the list of profiles exactly to
-    those specified in this command. To add/remove a particular profile from a
-    container, use {add|remove} below.
-    Example: lxc profile assign foo default,bar # Apply default and bar
-             lxc profile assign foo default # Only default is active
-             lxc profile assign '' # no profiles are applied anymore
-             lxc profile assign bar,default # Apply default second now
-lxc profile add [<remote>:]<container> <profile> # add a profile to a container
-lxc profile remove [<remote>:]<container> <profile> # remove the profile from a container
-
-Devices:
-lxc profile device list [<remote>:]<profile>                                List devices in the given profile.
-lxc profile device show [<remote>:]<profile>                                Show full device details in the given profile.
-lxc profile device remove [<remote>:]<profile> <name>                       Remove a device from a profile.
-lxc profile device get [<remote>:]<profile> <name> <key>                    Get a device property.
-lxc profile device set [<remote>:]<profile> <name> <key> <value>            Set a device property.
-lxc profile device unset [<remote>:]<profile> <name> <key>                  Unset a device property.
+    Replace the current set of profiles for the container by the one provided.
+
+lxc profile add [<remote>:]<container> <profile>
+    Add a profile to a container
+
+lxc profile remove [<remote>:]<container> <profile>
+    Remove the profile from a container
+
+*Device management*
+lxc profile device list [<remote>:]<profile>
+    List devices in the given profile.
+
+lxc profile device show [<remote>:]<profile>
+    Show full device details in the given profile.
+
+lxc profile device remove [<remote>:]<profile> <name>
+    Remove a device from a profile.
+
+lxc profile device get [<remote>:]<profile> <name> <key>
+    Get a device property.
+
+lxc profile device set [<remote>:]<profile> <name> <key> <value>
+    Set a device property.
+
+lxc profile device unset [<remote>:]<profile> <name> <key>
+    Unset a device property.
+
 lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]
-    Add a profile device, such as a disk or a nic, to the containers using the specified profile.`)
+    Add a profile device, such as a disk or a nic, to the containers using the specified profile.
+
+*Examples*
+cat profile.yaml | lxc profile edit <profile>
+    Update a profile using the content of profile.yaml
+
+lxc profile assign foo default,bar
+    Set the profiles for "foo" to "default" and "bar".
+
+lxc profile assign foo default
+    Reset "foo" to only using the "default" profile.
+
+lxc profile assign foo ''
+    Remove all profile from "foo"`)
 }
 
 func (c *profileCmd) flags() {}
 
 func (c *profileCmd) run(config *lxd.Config, args []string) error {
 	if len(args) < 1 {
-		return errArgs
+		return errUsage
 	}
 
 	if args[0] == "list" {

From 38796ecb9cedd6fe28fae9d7f6fb6d7ac8a5faec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:47 -0500
Subject: [PATCH 22/29] lxc/publish: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/publish.go b/lxc/publish.go
index b1e2521..b932dfa 100644
--- a/lxc/publish.go
+++ b/lxc/publish.go
@@ -25,9 +25,9 @@ func (c *publishCmd) showByDefault() bool {
 
 func (c *publishCmd) usage() string {
 	return i18n.G(
-		`Publish containers as images.
+		`Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--alias=ALIAS...] [prop-key=prop-value...]
 
-lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--alias=ALIAS...] [prop-key=prop-value...]`)
+Publish containers as images.`)
 }
 
 func (c *publishCmd) flags() {

From bd632a3700f7e1e34cf11877df6d16ad41d9283c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:47 -0500
Subject: [PATCH 23/29] lxc/remote: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/remote.go b/lxc/remote.go
index 493d154..6d6e725 100644
--- a/lxc/remote.go
+++ b/lxc/remote.go
@@ -35,16 +35,30 @@ func (c *remoteCmd) showByDefault() bool {
 
 func (c *remoteCmd) usage() string {
 	return i18n.G(
-		`Manage remote LXD servers.
-
-lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--password=PASSWORD]
-                                        [--public] [--protocol=PROTOCOL]    Add the remote <remote> at <url>.
-lxc remote remove <remote>                                                  Remove the remote <remote>.
-lxc remote list                                                             List all remotes.
-lxc remote rename <old name> <new name>                                     Rename remote <old name> to <new name>.
-lxc remote set-url <remote> <url>                                           Update <remote>'s url to <url>.
-lxc remote set-default <remote>                                             Set the default remote.
-lxc remote get-default                                                      Print the default remote.`)
+		`Usage: lxc remote <subcommand> [options]
+
+Manage the list of remote LXD servers.
+
+lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--password=PASSWORD] [--public] [--protocol=PROTOCOL]
+    Add the remote <remote> at <url>.
+
+lxc remote remove <remote>
+    Remove the remote <remote>.
+
+lxc remote list
+    List all remotes.
+
+lxc remote rename <old name> <new name>
+    Rename remote <old name> to <new name>.
+
+lxc remote set-url <remote> <url>
+    Update <remote>'s url to <url>.
+
+lxc remote set-default <remote>
+    Set the default remote.
+
+lxc remote get-default
+    Print the default remote.`)
 }
 
 func (c *remoteCmd) flags() {
@@ -300,7 +314,7 @@ func (c *remoteCmd) removeCertificate(config *lxd.Config, remote string) {
 
 func (c *remoteCmd) run(config *lxd.Config, args []string) error {
 	if len(args) < 1 {
-		return errArgs
+		return errUsage
 	}
 
 	switch args[0] {

From f2b1c82a2a45f501197ed73a04c961a932b3ca49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:47 -0500
Subject: [PATCH 24/29] lxc/restore: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/restore.go b/lxc/restore.go
index b37b3ef..cd4024b 100644
--- a/lxc/restore.go
+++ b/lxc/restore.go
@@ -19,19 +19,18 @@ func (c *restoreCmd) showByDefault() bool {
 
 func (c *restoreCmd) usage() string {
 	return i18n.G(
-		`Restore a container's state to a previous snapshot.
+		`Usage: lxc restore [<remote>:]<container> <snapshot> [--stateful]
 
-lxc restore [<remote>:]<container> <snapshot> [--stateful]
+Restore containers from snapshots.
 
-Restores a container from a snapshot (optionally with running state, see
-snapshot help for details).
+If --stateful is passed, then the running state will be restored too.
 
-Examples:
-Create the snapshot:
-    lxc snapshot u1 snap0
+*Examples*
+lxc snapshot u1 snap0
+    Create the snapshot.
 
-Restore the snapshot:
-    lxc restore u1 snap0`)
+lxc restore u1 snap0
+    Restore the snapshot.`)
 }
 
 func (c *restoreCmd) flags() {

From 0148ba5c6b173d89105978f8a908bd9fc893af8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:47 -0500
Subject: [PATCH 25/29] lxc/snapshot: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/snapshot.go b/lxc/snapshot.go
index 50a01ad..7f92b04 100644
--- a/lxc/snapshot.go
+++ b/lxc/snapshot.go
@@ -19,19 +19,16 @@ func (c *snapshotCmd) showByDefault() bool {
 
 func (c *snapshotCmd) usage() string {
 	return i18n.G(
-		`Create a read-only snapshot of a container.
+		`Usage: lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]
 
-lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]
+Create container snapshots.
 
-Creates a snapshot of the container (optionally with the container's memory
-state). When --stateful is used, LXD attempts to checkpoint the container's
-running state, including process memory state, TCP connections, etc. so that it
-can be restored (via lxc restore) at a later time (although some things, e.g.
-TCP connections after the TCP timeout window has expired, may not be restored
-successfully).
+When --stateful is used, LXD attempts to checkpoint the container's
+running state, including process memory state, TCP connections, ...
 
-Example:
-    lxc snapshot u1 snap0`)
+*Examples*
+lxc snapshot u1 snap0
+    Create a snapshot of "u1" called "snap0".`)
 }
 
 func (c *snapshotCmd) flags() {

From 57110ce48bc9b9d1ec995504663a64962e4db400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:48 -0500
Subject: [PATCH 26/29] lxc/storage: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/storage.go b/lxc/storage.go
index cababcf..365ca5d 100644
--- a/lxc/storage.go
+++ b/lxc/storage.go
@@ -59,55 +59,93 @@ func (c *storageCmd) storagePoolVolumeEditHelp() string {
 
 func (c *storageCmd) usage() string {
 	return i18n.G(
-		`Manage storage.
-
-lxc storage list [<remote>:]                                    List available storage pools.
-lxc storage show [<remote>:]<pool>                              Show details of a storage pool.
-lxc storage create [<remote>:]<pool> <driver> [key=value]...    Create a storage pool.
-lxc storage get [<remote>:]<pool> <key>                         Get storage pool configuration.
-lxc storage set [<remote>:]<pool> <key> <value>                 Set storage pool configuration.
-lxc storage unset [<remote>:]<pool> <key>                       Unset storage pool configuration.
-lxc storage delete [<remote>:]<pool>                            Delete a storage pool.
+		`Usage: lxc storage <subcommand> [options]
+
+Manage storage pools and volumes.
+
+*Storage pools*
+lxc storage list [<remote>:]
+    List available storage pools.
+
+lxc storage show [<remote>:]<pool>
+    Show details of a storage pool.
+
+lxc storage create [<remote>:]<pool> <driver> [key=value]...
+    Create a storage pool.
+
+lxc storage get [<remote>:]<pool> <key>
+    Get storage pool configuration.
+
+lxc storage set [<remote>:]<pool> <key> <value>
+    Set storage pool configuration.
+
+lxc storage unset [<remote>:]<pool> <key>
+    Unset storage pool configuration.
+
+lxc storage delete [<remote>:]<pool>
+    Delete a storage pool.
+
 lxc storage edit [<remote>:]<pool>
     Edit storage pool, either by launching external editor or reading STDIN.
-    Example: lxc storage edit [<remote>:]<pool> # launch editor
-             cat pool.yaml | lxc storage edit [<remote>:]<pool> # read from pool.yaml
-
-lxc storage volume list [<remote>:]<pool>                              List available storage volumes on a storage pool.
-lxc storage volume show [<remote>:]<pool> <volume>                     Show details of a storage volume on a storage pool.
-lxc storage volume create [<remote>:]<pool> <volume> [key=value]...    Create a storage volume on a storage pool.
-lxc storage volume get [<remote>:]<pool> <volume> <key>                Get storage volume configuration on a storage pool.
-lxc storage volume set [<remote>:]<pool> <volume> <key> <value>        Set storage volume configuration on a storage pool.
-lxc storage volume unset [<remote>:]<pool> <volume> <key>              Unset storage volume configuration on a storage pool.
-lxc storage volume delete [<remote>:]<pool> <volume>                   Delete a storage volume on a storage pool.
+
+*Storage volumes*
+lxc storage volume list [<remote>:]<pool>
+    List available storage volumes on a storage pool.
+
+lxc storage volume show [<remote>:]<pool> <volume>
+    Show details of a storage volume on a storage pool.
+
+lxc storage volume create [<remote>:]<pool> <volume> [key=value]...
+    Create a storage volume on a storage pool.
+
+lxc storage volume get [<remote>:]<pool> <volume> <key>
+    Get storage volume configuration on a storage pool.
+
+lxc storage volume set [<remote>:]<pool> <volume> <key> <value>
+    Set storage volume configuration on a storage pool.
+
+lxc storage volume unset [<remote>:]<pool> <volume> <key>
+    Unset storage volume configuration on a storage pool.
+
+lxc storage volume delete [<remote>:]<pool> <volume>
+    Delete a storage volume on a storage pool.
+
 lxc storage volume edit [<remote>:]<pool> <volume>
     Edit storage pool, either by launching external editor or reading STDIN.
-    Example: lxc storage volume edit [<remote>:]<pool> <volume> # launch editor
-             cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume> # read from pool.yaml
 
 lxc storage volume attach [<remote>:]<pool> <volume> <container> [device name] <path>
+    Attach a storage volume to the specified container.
+
 lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> [device name] <path>
+    Attach a storage volume to the specified profile.
 
 lxc storage volume detach [<remote>:]<pool> <volume> <container> [device name]
-lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> [device name]
+    Detach a storage volume from the specified container.
 
+lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> [device name]
+    Detach a storage volume from the specified profile.
 
 Unless specified through a prefix, all volume operations affect "custom" (user created) volumes.
 
-Examples:
-To show the properties of a custom volume called "data" in the "default" pool:
-    lxc storage volume show default data
+*Examples*
+cat pool.yaml | lxc storage edit [<remote>:]<pool>
+    Update a storage pool using the content of pool.yaml.
+
+cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume>
+    Update a storage volume using the content of pool.yaml.
 
-To show the properties of the filesystem for a container called "data" in the "default" pool:
-    lxc storage volume show default container/data
-`)
+lxc storage volume show default data
+    Will show the properties of a custom volume called "data" in the "default" pool.
+
+lxc storage volume show default container/data
+    Will show the properties of the filesystem for a container called "data" in the "default" pool.`)
 }
 
 func (c *storageCmd) flags() {}
 
 func (c *storageCmd) run(config *lxd.Config, args []string) error {
 	if len(args) < 1 {
-		return errArgs
+		return errUsage
 	}
 
 	if args[0] == "list" {

From fc2093ec8b576cffe710783842aad207166956b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:48 -0500
Subject: [PATCH 27/29] lxc/utils: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/utils.go b/lxc/utils.go
index 00672e3..0611f9b 100644
--- a/lxc/utils.go
+++ b/lxc/utils.go
@@ -3,6 +3,8 @@ package main
 import (
 	"fmt"
 	"strings"
+
+	"github.com/lxc/lxd/shared/i18n"
 )
 
 // Progress tracking
@@ -151,3 +153,22 @@ func runBatch(names []string, action func(name string) error) []batchResult {
 
 	return results
 }
+
+// summaryLine returns the first line of the help text. Conventionally, this
+// should be a one-line command summary, potentially followed by a longer
+// explanation.
+func summaryLine(usage string) string {
+	for _, line := range strings.Split(usage, "\n") {
+		if strings.HasPrefix(line, "Usage:") {
+			continue
+		}
+
+		if len(line) == 0 {
+			continue
+		}
+
+		return strings.TrimSuffix(line, ".")
+	}
+
+	return i18n.G("Missing summary.")
+}

From 11565440d3ef2f0ec71be74f448b4edafebb1b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:17:48 -0500
Subject: [PATCH 28/29] lxc/version: Rework usage to be parsable by help2man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxc/version.go b/lxc/version.go
index 973eede..38595fd 100644
--- a/lxc/version.go
+++ b/lxc/version.go
@@ -16,9 +16,9 @@ func (c *versionCmd) showByDefault() bool {
 
 func (c *versionCmd) usage() string {
 	return i18n.G(
-		`Prints the version number of this client tool.
+		`Usage: lxc version
 
-lxc version`)
+Print the version number of this client tool.`)
 }
 
 func (c *versionCmd) flags() {

From 9d9b0ce7d9b200663a41c7bda81761cf1d35e462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Mar 2017 02:22:02 -0500
Subject: [PATCH 29/29] i18n: Update translation templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 po/de.po   | 2236 +++++++++++++++++++++++++---------------------
 po/el.po   | 1952 +++++++++++++++++++++-------------------
 po/fr.po   | 2900 ++++++++++++++++++++++++++++++++----------------------------
 po/ja.po   | 2854 +++++++++++++++++++++++++++++++----------------------------
 po/lxd.pot | 1569 ++++++++++++++++++--------------
 po/nl.po   | 1962 +++++++++++++++++++++-------------------
 po/ru.po   | 1944 +++++++++++++++++++++-------------------
 7 files changed, 8324 insertions(+), 7093 deletions(-)

diff --git a/po/de.po b/po/de.po
index e23a60e..b4fd22f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-03-05 02:20-0500\n"
+"POT-Creation-Date: 2017-03-05 02:21-0500\n"
 "PO-Revision-Date: 2017-02-14 17:11+0000\n"
 "Last-Translator: Tim Rose <tim at netlope.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -208,146 +208,124 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
-#: lxc/image.go:586
+#: lxc/image.go:588
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/snapshot.go:61
+#: lxc/snapshot.go:58
 #, fuzzy
 msgid "'/' not allowed in snapshot name"
 msgstr "'/' ist kein gültiges Zeichen im Namen eines Sicherungspunktes\n"
 
-#: lxc/profile.go:254
+#: lxc/profile.go:293
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:607 lxc/image.go:649
+#: lxc/image.go:609 lxc/image.go:651
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:611
+#: lxc/image.go:613
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:406
+#: lxc/list.go:430
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:51
+#: lxc/remote.go:65
 msgid "Accept certificate"
 msgstr "Akzeptiere Zertifikat"
 
-#: lxc/remote.go:267
+#: lxc/remote.go:281
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Administrator Passwort für %s: "
 
-#: lxc/image.go:334
+#: lxc/image.go:336
 #, fuzzy
 msgid "Aliases:"
 msgstr "Aliasse:\n"
 
-#: lxc/image.go:312 lxc/info.go:93
+#: lxc/image.go:314 lxc/info.go:95
 #, fuzzy, c-format
 msgid "Architecture: %s"
 msgstr "Architektur: %s\n"
 
-#: lxc/image.go:338
+#: lxc/image.go:340
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/help.go:49
-msgid "Available commands:"
-msgstr ""
-
-#: lxc/info.go:186
+#: lxc/info.go:188
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:187
+#: lxc/info.go:189
 msgid "Bytes sent"
 msgstr ""
 
-#: lxc/config.go:274
+#: lxc/config.go:310
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:150
+#: lxc/info.go:152
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:154
+#: lxc/info.go:156
 #, fuzzy
 msgid "CPU usage:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/list.go:407
+#: lxc/list.go:431
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/config.go:114 lxc/network.go:471
+#: lxc/config.go:150 lxc/network.go:495
 #, c-format
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/config.go:127 lxc/config.go:160 lxc/config.go:182
+#: lxc/config.go:163 lxc/config.go:196 lxc/config.go:218
 #, c-format
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
+#: lxc/network.go:422 lxc/profile.go:472 lxc/storage.go:579
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:217
+#: lxc/remote.go:231
 #, fuzzy, c-format
 msgid "Certificate fingerprint: %x"
 msgstr "Fingerabdruck des Zertifikats: % x\n"
 
-#: lxc/action.go:36
-#, fuzzy, c-format
-msgid ""
-"Change state of one or more containers to %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-msgstr ""
-"Ändert den Laufzustand eines Containers in %s.\n"
-"\n"
-"lxd %s <Name>\n"
-
-#: lxc/finger.go:15
-#, fuzzy
-msgid ""
-"Check if the LXD instance is up.\n"
-"\n"
-"lxc finger [<remote>:]"
-msgstr ""
-"Fingert die LXD Instanz zum überprüfen ob diese funktionsfähig ist.\n"
-"\n"
-"lxc finger <remote>\n"
-
-#: lxc/remote.go:290
+#: lxc/remote.go:304
 msgid "Client certificate stored at server: "
 msgstr "Gespeichertes Nutzerzertifikat auf dem Server: "
 
-#: lxc/list.go:101 lxc/list.go:102
+#: lxc/list.go:125 lxc/list.go:126
 msgid "Columns"
 msgstr ""
 
-#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:137 lxc/init.go:138
+#: lxc/help.go:53
+msgid "Commands:"
+msgstr ""
+
+#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:135 lxc/init.go:136
 #, fuzzy
 msgid "Config key/value to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config.go:535 lxc/config.go:600 lxc/image.go:703 lxc/network.go:354
-#: lxc/profile.go:218 lxc/storage.go:497 lxc/storage.go:802
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:705 lxc/network.go:378
+#: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:840
 #, fuzzy, c-format
 msgid "Config parsing error: %s"
 msgstr "YAML Analyse Fehler %v\n"
 
-#: lxc/main.go:29
+#: lxc/main.go:32
 msgid "Connection refused; is LXD running?"
 msgstr ""
 
@@ -355,7 +333,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:246
+#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:244
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -365,80 +343,48 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:132
+#: lxc/image.go:134
 msgid "Copy aliases from source"
 msgstr "Kopiere Aliasse von der Quelle"
 
-#: lxc/copy.go:25
-#, fuzzy
-msgid ""
-"Copy containers within or in between LXD instances.\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
-"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-msgstr ""
-"Kopiert Container innerhalb einer oder zwischen lxd Instanzen\n"
-"\n"
-"lxc copy <Quelle> <Ziel>\n"
-
-#: lxc/image.go:245
+#: lxc/image.go:247
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:232
+#: lxc/remote.go:246
 msgid "Could not create server cert dir"
 msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 
-#: lxc/file.go:84
+#: lxc/file.go:91
 #, c-format
 msgid "Could not sanitize path %s"
 msgstr ""
 
-#: lxc/snapshot.go:21
-msgid ""
-"Create a read-only snapshot of a container.\n"
-"\n"
-"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Creates a snapshot of the container (optionally with the container's memory\n"
-"state). When --stateful is used, LXD attempts to checkpoint the container's\n"
-"running state, including process memory state, TCP connections, etc. so that "
-"it\n"
-"can be restored (via lxc restore) at a later time (although some things, e."
-"g.\n"
-"TCP connections after the TCP timeout window has expired, may not be "
-"restored\n"
-"successfully).\n"
-"\n"
-"Example:\n"
-"    lxc snapshot u1 snap0"
-msgstr ""
-
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:67 lxc/file.go:68
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:317 lxc/info.go:95
+#: lxc/image.go:319 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:184 lxc/launch.go:139
+#: lxc/init.go:182 lxc/launch.go:137
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:182
+#: lxc/init.go:180
 #, fuzzy
 msgid "Creating the container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/image.go:610 lxc/image.go:651
+#: lxc/image.go:612 lxc/image.go:653
 msgid "DESCRIPTION"
 msgstr ""
 
-#: lxc/storage.go:570
+#: lxc/storage.go:608
 msgid "DRIVER"
 msgstr ""
 
@@ -446,51 +392,35 @@ msgstr ""
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
-#: lxc/delete.go:26
-#, fuzzy
-msgid ""
-"Delete containers or snapshots.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Destroy containers or snapshots with any attached data (configuration, "
-"snapshots, ...)."
-msgstr ""
-"Löscht einen Container oder Container Sicherungspunkt.\n"
-"\n"
-"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
-"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-
-#: lxc/config.go:652
+#: lxc/config.go:688
 #, fuzzy, c-format
 msgid "Device %s added to %s"
 msgstr "Gerät %s wurde zu %s hinzugefügt\n"
 
-#: lxc/config.go:839
+#: lxc/config.go:875
 #, fuzzy, c-format
 msgid "Device %s removed from %s"
 msgstr "Gerät %s wurde von %s entfernt\n"
 
-#: lxc/info.go:143
+#: lxc/info.go:145
 #, fuzzy
 msgid "Disk usage:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/list.go:554
+#: lxc/list.go:578
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config.go:276
+#: lxc/config.go:312
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/main.go:41
+#: lxc/main.go:44
 #, fuzzy
 msgid "Enable debug mode"
 msgstr "Aktiviert Debug Modus"
 
-#: lxc/main.go:40
+#: lxc/main.go:43
 #, fuzzy
 msgid "Enable verbose mode"
 msgstr "Aktiviert ausführliche Ausgabe"
@@ -499,11 +429,11 @@ msgstr "Aktiviert ausführliche Ausgabe"
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/help.go:69
+#: lxc/help.go:77
 msgid "Environment:"
 msgstr ""
 
-#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:141 lxc/init.go:142
+#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:139 lxc/init.go:140
 msgid "Ephemeral container"
 msgstr "Flüchtiger Container"
 
@@ -511,150 +441,105 @@ msgstr "Flüchtiger Container"
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/exec.go:46
-#, fuzzy
-msgid ""
-"Execute the specified command in a container.\n"
-"\n"
-"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
-"env KEY=VALUE...] [--] <command line>\n"
-"\n"
-"Mode defaults to non-interactive, interactive mode is selected if both stdin "
-"AND stdout are terminals (stderr is ignored)."
-msgstr ""
-"Führt den angegebenen Befehl in einem Container aus.\n"
-"\n"
-"lxc exec <Container> [--env EDITOR=/usr/bin/vim]... <Befehl>\n"
-
-#: lxc/image.go:321
+#: lxc/image.go:323
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:323
+#: lxc/image.go:325
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:273 lxc/image.go:608 lxc/image.go:650
+#: lxc/config.go:309 lxc/image.go:610 lxc/image.go:652
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/list.go:104
-msgid "Fast mode (same as --columns=nsacPt"
+#: lxc/manpage.go:62
+#, c-format
+msgid "Failed to generate 'lxc.%s.1': %v"
+msgstr ""
+
+#: lxc/manpage.go:55
+#, c-format
+msgid "Failed to generate 'lxc.1': %v"
+msgstr ""
+
+#: lxc/list.go:128
+msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:312
 #, fuzzy, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerabdruck: %s\n"
 
-#: lxc/action.go:45 lxc/action.go:46
+#: lxc/action.go:46 lxc/action.go:47
 #, fuzzy
 msgid "Force the container to shutdown"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/delete.go:35 lxc/delete.go:36
+#: lxc/delete.go:33 lxc/delete.go:34
 msgid "Force the removal of stopped containers"
 msgstr ""
 
-#: lxc/main.go:42
+#: lxc/main.go:45
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:135 lxc/list.go:103
+#: lxc/image.go:137 lxc/list.go:127
 msgid "Format"
 msgstr ""
 
-#: lxc/remote.go:65
+#: lxc/remote.go:79
 #, fuzzy
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "Generiere Nutzerzertifikat. Dies kann wenige Minuten dauern...\n"
 
-#: lxc/help.go:25
-#, fuzzy
-msgid ""
-"Help page for the LXD client.\n"
-"\n"
-"lxc help [--all]"
-msgstr ""
-"Zeigt Details über die Benutzung von LXD an.\n"
-"\n"
-"lxd help [—all]\n"
-
-#: lxc/list.go:404
+#: lxc/list.go:428
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:405
+#: lxc/list.go:429
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config.go:275
+#: lxc/config.go:311
 msgid "ISSUE DATE"
 msgstr ""
 
-#: lxc/main.go:136
+#: lxc/main.go:139
 msgid "If this is your first time using LXD, you should also run: lxd init"
 msgstr ""
 
-#: lxc/main.go:43
+#: lxc/main.go:46
 msgid "Ignore aliases when determining what command to run"
 msgstr ""
 
-#: lxc/action.go:49
+#: lxc/action.go:50
 #, fuzzy
 msgid "Ignore the container state (only for start)"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:248
+#: lxc/image.go:250
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:393 lxc/image.go:405
+#: lxc/image.go:395 lxc/image.go:407
 #, fuzzy, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:390
+#: lxc/image.go:392
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
 
-#: lxc/init.go:75
-#, fuzzy
-msgid ""
-"Initialize a container from a particular image.\n"
-"\n"
-"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
-"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--"
-"storage|-s <pool>]\n"
-"\n"
-"Initializes a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc init ubuntu:16.04 u1"
-msgstr ""
-"Starte Container von gegebenem Abbild.\n"
-"\n"
-"lxc launch <Abbild> [<Name>] [—ephemeral|-e] [—profile|-p <Profile>…]\n"
-"\n"
-"Startet einen Container von gegebenem Abbild und mit Namen\n"
-"\n"
-"Ohne den -p Parameter wird das default Profil benutzt.\n"
-"Wird -p ohne Argument angegeben, wird kein Profil verwendet\n"
-"\n"
-"Beispiel:\n"
-"lxc launch ubuntu u1\n"
-
-#: lxc/remote.go:135
+#: lxc/remote.go:149
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config.go:254
+#: lxc/config.go:290
 #, fuzzy
 msgid "Invalid certificate"
 msgstr "Akzeptiere Zertifikat"
@@ -663,177 +548,55 @@ msgstr "Akzeptiere Zertifikat"
 msgid "Invalid configuration key"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:359
 #, fuzzy, c-format
 msgid "Invalid path %s"
 msgstr "Ungültiges Ziel %s"
 
-#: lxc/file.go:286
+#: lxc/file.go:293
 #, c-format
 msgid "Invalid source %s"
 msgstr "Ungültige Quelle %s"
 
-#: lxc/file.go:73
+#: lxc/file.go:80
 #, c-format
 msgid "Invalid target %s"
 msgstr "Ungültiges Ziel %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:126
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:133
+#: lxc/image.go:135
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:408
+#: lxc/list.go:432
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/main.go:27
+#: lxc/main.go:30
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:326
+#: lxc/image.go:328
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:328
+#: lxc/image.go:330
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/launch.go:23
-#, fuzzy
-msgid ""
-"Launch a container from a particular image.\n"
-"\n"
-"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
-"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
-"<network>] [--storage|-s <pool>]\n"
-"\n"
-"Launches a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc launch ubuntu:16.04 u1"
-msgstr ""
-"Starte Container von gegebenem Abbild.\n"
-"\n"
-"lxc launch <Abbild> [<Name>] [—ephemeral|-e] [—profile|-p <Profile>…]\n"
-"\n"
-"Startet einen Container von gegebenem Abbild und mit Namen\n"
-"\n"
-"Ohne den -p Parameter wird das default Profil benutzt.\n"
-"Wird -p ohne Argument angegeben, wird kein Profil verwendet\n"
-"\n"
-"Beispiel:\n"
-"lxc launch ubuntu u1\n"
-
-#: lxc/info.go:25
-#, fuzzy
-msgid ""
-"List information on LXD servers and containers.\n"
-"\n"
-"For a container:\n"
-"    lxc info [<remote:>]<container> [--show-log]\n"
-"\n"
-"For a server:\n"
-"    lxc info [<remote:>]"
-msgstr ""
-"Listet Informationen über Container.\n"
-"\n"
-"Dies wird entfernte Instanzen und Abbilder unterstützen, \n"
-"zur Zeit jedoch nur Container.\n"
-"\n"
-"lxc info [<remote>:]Container [--show-log]\n"
-
-#: lxc/list.go:47
-#, fuzzy
-msgid ""
-"Lists the containers.\n"
-"\n"
-"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
-"fast]\n"
-"\n"
-"The filters are:\n"
-"* A single keyword like \"web\" which will list any container with a name "
-"starting by \"web\".\n"
-"* A regular expression on the container name. (e.g. .*web.*01$)\n"
-"* A key/value pair referring to a configuration item. For those, the "
-"namespace can be abbreviated to the smallest unambiguous identifier:\n"
-" * \"user.blah=abc\" will list all containers with the \"blah\" user "
-"property set to \"abc\".\n"
-" * \"u.blah=abc\" will do the same\n"
-" * \"security.privileged=1\" will list all privileged containers\n"
-" * \"s.privileged=1\" will do the same\n"
-"* A regular expression matching a configuration item or its value. (e.g. "
-"volatile.eth0.hwaddr=00:16:3e:.*)\n"
-"\n"
-"The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table format.\n"
-"Column arguments are either pre-defined shorthand chars (see below),\n"
-"or (extended) config keys.  Commas between consecutive shorthand chars\n"
-"are optional.\n"
-"\n"
-"Pre-defined shorthand chars:\n"
-"* 4 - IPv4 address\n"
-"* 6 - IPv6 address\n"
-"* a - architecture\n"
-"* b - storage pool\n"
-"* c - creation date\n"
-"* l - last used date\n"
-"* n - name\n"
-"* p - pid of container init process\n"
-"* P - profiles\n"
-"* s - state\n"
-"* S - number of snapshots\n"
-"* t - type (persistent or ephemeral)\n"
-"\n"
-"Config key syntax: key[:name][:maxWidth]\n"
-"* key      - The (extended) config key to display\n"
-"* name     - Name to display in the column header, defaults to the key\n"
-"             if not specified or if empty (to allow defining maxWidth\n"
-"             without a custom name, e.g. user.key::0)\n"
-"* maxWidth - Max width of the column (longer results are truncated).\n"
-"             -1 == unlimited\n"
-"              0 == width of column header\n"
-"             >0 == max width in chars\n"
-"             Default is -1 (unlimited)\n"
-"\n"
-"Default column layout: ns46tS\n"
-"Fast column layout: nsacPt\n"
-"\n"
-"Example:\n"
-"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
-"hwaddr:MAC"
-msgstr ""
-"Listet vorhandene Ressourcen.\n"
-"\n"
-"lxc list [Resource] [Filter]\n"
-"\n"
-"Filter sind:\n"
-"* Ein einzelnes Schlüsselwort wie \"web“, was alle Container mit \"web\" im "
-"Namen listet.\n"
-"* Ein key/value Paar bezüglich eines Konfigurationsparameters. Dafür kann "
-"der Namensraum, solange eindeutig, abgekürzt werden:\n"
-"* \"user.blah=abc\" listet alle Container mit der \"blah\" Benutzer "
-"Eigenschaft \"abc\"\n"
-"* \"u.blah=abc\" ebenfalls\n"
-"* \"security.privileged=1\" listet alle privilegierten Container\n"
-"* \"s.privileged=1\" ebenfalls\n"
-
-#: lxc/info.go:239
+#: lxc/info.go:241
 msgid "Log:"
 msgstr ""
 
-#: lxc/network.go:436
+#: lxc/network.go:460
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:131
+#: lxc/image.go:133
 msgid "Make image public"
 msgstr "Veröffentliche Abbild"
 
@@ -842,586 +605,113 @@ msgstr "Veröffentliche Abbild"
 msgid "Make the image public"
 msgstr "Veröffentliche Abbild"
 
-#: lxc/profile.go:49
-#, fuzzy
-msgid ""
-"Manage configuration profiles.\n"
-"\n"
-"lxc profile list [<remote>:]                                    List "
-"available profiles.\n"
-"lxc profile show [<remote>:]<profile>                           Show details "
-"of a profile.\n"
-"lxc profile create [<remote>:]<profile>                         Create a "
-"profile.\n"
-"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>      Copy the "
-"profile.\n"
-"lxc profile get [<remote>:]<profile> <key>                      Get profile "
-"configuration.\n"
-"lxc profile set [<remote>:]<profile> <key> <value>              Set profile "
-"configuration.\n"
-"lxc profile unset [<remote>:]<profile> <key>                    Unset "
-"profile configuration.\n"
-"lxc profile delete [<remote>:]<profile>                         Delete a "
-"profile.\n"
-"lxc profile edit [<remote>:]<profile>\n"
-"    Edit profile, either by launching external editor or reading STDIN.\n"
-"    Example: lxc profile edit <profile> # launch editor\n"
-"             cat profile.yaml | lxc profile edit <profile> # read from "
-"profile.yaml\n"
-"\n"
-"lxc profile assign [<remote>:]<container> <profiles>\n"
-"    Assign a comma-separated list of profiles to a container, in order.\n"
-"    All profiles passed in this call (and only those) will be applied\n"
-"    to the specified container, i.e. it sets the list of profiles exactly "
-"to\n"
-"    those specified in this command. To add/remove a particular profile from "
-"a\n"
-"    container, use {add|remove} below.\n"
-"    Example: lxc profile assign foo default,bar # Apply default and bar\n"
-"             lxc profile assign foo default # Only default is active\n"
-"             lxc profile assign '' # no profiles are applied anymore\n"
-"             lxc profile assign bar,default # Apply default second now\n"
-"lxc profile add [<remote>:]<container> <profile> # add a profile to a "
-"container\n"
-"lxc profile remove [<remote>:]<container> <profile> # remove the profile "
-"from a container\n"
-"\n"
-"Devices:\n"
-"lxc profile device list [<remote>:]<profile>                                "
-"List devices in the given profile.\n"
-"lxc profile device show [<remote>:]<profile>                                "
-"Show full device details in the given profile.\n"
-"lxc profile device remove [<remote>:]<profile> <name>                       "
-"Remove a device from a profile.\n"
-"lxc profile device get [<remote>:]<profile> <name> <key>                    "
-"Get a device property.\n"
-"lxc profile device set [<remote>:]<profile> <name> <key> <value>            "
-"Set a device property.\n"
-"lxc profile device unset [<remote>:]<profile> <name> <key>                  "
-"Unset a device property.\n"
-"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
-"    Add a profile device, such as a disk or a nic, to the containers using "
-"the specified profile."
+#: lxc/info.go:163
+msgid "Memory (current)"
 msgstr ""
-"Verwalte Konfigurationsprofile.\n"
-"\n"
-"lxc profile list [Filter]                     Listet verfügbare Profile\n"
-"lxc profile show <Profil>                     Zeigt Details zu einem Profil\n"
-"lxc profile create <Profil>                   Erstellt ein Profil\n"
-"lxc profile edit <Profil>                     Bearbeitet das Profil in "
-"externem Editor\n"
-"lxc profile copy <Profil> <remote>            Kopiert das Profil zur "
-"entfernten Instanz\n"
-"lxc profile set <Profil> <key> <value>        Setzt eine "
-"Profilkonfiguration\n"
-"lxc profile delete <Profil>                   Löscht ein Profil\n"
-"lxc profile apply <Container> <Profil>\n"
-"    Wendet eine durch Kommata getrennte Liste von Profilen,\n"
-"    in gegeben Reihenfolge, auf einen Container an.\n"
-"    Alle angegeben, und nur diese, werden auf den Container angewandt.\n"
-"    Beispiel: lxc profile apply foo default,bar # Wende default und bar an\n"
-"             lxc profile apply foo default # Nur default ist aktiv\n"
-"             lxc profile apply '' # keine Profile werden angewandt\n"
-"             lxc profile apply bar,default # Wende nun default als zweites "
-"an\n"
-"\n"
-"Geräte:\n"
-"lxc profile device list <Profil>              Listet Geräte im Profil\n"
-"lxc profile device show <Profil>              Zeigt alle Geräte Details im "
-"gegebenen Profil.\n"
-"lxc profile device remove <Profil> <name>     Entfernt ein Gerät von dem "
-"Profil.\n"
-"lxc profile device add <Profil name> <Gerätename> <Gerätetype> "
-"[key=value]...\n"
-"    Fügt ein Gerät, wie zum Beispiel eine Festplatte oder Netzwerkkarte, den "
-"Containern hinzu,\n"
-"    die dieses Profil verwenden.\n"
 
-#: lxc/config.go:58
+#: lxc/info.go:167
+msgid "Memory (peak)"
+msgstr ""
+
+#: lxc/info.go:179
+msgid "Memory usage:"
+msgstr ""
+
+#: lxc/utils.go:173
+msgid "Missing summary."
+msgstr "Fehlende Zusammenfassung."
+
+#: lxc/network.go:248 lxc/network.go:297 lxc/storage.go:362 lxc/storage.go:462
+msgid "More than one device matches, specify the device name."
+msgstr ""
+
+#: lxc/file.go:281
+msgid "More than one file to download, but target is not a directory"
+msgstr ""
+"Mehr als eine Datei herunterzuladen, aber das Ziel ist kein Verzeichnis"
+
+#: lxc/action.go:68
 #, fuzzy
-msgid ""
-"Manage configuration.\n"
-"\n"
-"lxc config device add [<remote>:]<container> <device> <type> "
-"[key=value...]   Add a device to a container.\n"
-"lxc config device get [<remote>:]<container> <device> "
-"<key>                   Get a device property.\n"
-"lxc config device set [<remote>:]<container> <device> <key> "
-"<value>           Set a device property.\n"
-"lxc config device unset [<remote>:]<container> <device> "
-"<key>                 Unset a device property.\n"
-"lxc config device list "
-"[<remote>:]<container>                                 List devices for "
-"container.\n"
-"lxc config device show "
-"[<remote>:]<container>                                 Show full device "
-"details for container.\n"
-"lxc config device remove [<remote>:]<container> "
-"<name>                        Remove device from container.\n"
-"\n"
-"lxc config get [<remote>:][container] "
-"<key>                                   Get container or server "
-"configuration key.\n"
-"lxc config set [<remote>:][container] <key> "
-"<value>                           Set container or server configuration "
-"key.\n"
-"lxc config unset [<remote>:][container] "
-"<key>                                 Unset container or server "
-"configuration key.\n"
-"lxc config show [<remote>:][container] [--"
-"expanded]                           Show container or server configuration.\n"
-"lxc config edit [<remote>:]"
-"[container]                                        Edit container or server "
-"configuration in external editor.\n"
-"    Edit configuration, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc config edit <container> # launch editor\n"
-"             cat config.yaml | lxc config edit <container> # read from "
-"config.yaml\n"
-"\n"
-"lxc config trust list "
-"[<remote>:]                                             List all trusted "
-"certs.\n"
-"lxc config trust add [<remote>:] <certfile."
-"crt>                               Add certfile.crt to trusted hosts.\n"
-"lxc config trust remove [<remote>:] [hostname|"
-"fingerprint]                    Remove the cert from trusted hosts.\n"
-"\n"
-"Examples:\n"
-"To mount host's /share/c1 onto /opt in the container:\n"
-"    lxc config device add [<remote>:]container1 <device-name> disk source=/"
-"share/c1 path=opt\n"
-"\n"
-"To set an lxc config value:\n"
-"    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = "
-"1'\n"
-"\n"
-"To listen on IPv4 and IPv6 port 8443 (you can omit the 8443 its the "
-"default):\n"
-"    lxc config set core.https_address [::]:8443\n"
-"\n"
-"To set the server trust password:\n"
-"    lxc config set core.trust_password blah"
-msgstr ""
-"Verwalte Konfiguration.\n"
-"\n"
-"lxc config device add <Container> <Name> <Type> [key=value]...\n"
-"               Füge ein Gerät zu einem Container hinzu\n"
-"lxc config device list <Container>                     Listet die Geräte des "
-"Containers\n"
-"lxc config device show <Container>                     Zeigt alle Geräte "
-"Details für den Container\n"
-"lxc config device remove <Container> <Name>            Entfernt Gerät vom "
-"Container\n"
-"lxc config edit <Container>                            Bearbeite Container "
-"Konfiguration in externem Editor\n"
-"lxc config get <Container> key                         Holt "
-"Konfigurationsschlüssel\n"
-"lxc config set <Container> key [value]                 Setzt Container "
-"Konfigurationsschlüssel\n"
-"lxc config show <Container>                            Zeigt Konfiguration "
-"des Containers\n"
-"lxc config trust list [remote]                         Liste alle "
-"vertrauenswürdigen Zertifikate.\n"
-"lxc config trust add [remote] [certfile.crt]           Füge certfile.crt zu "
-"vertrauenden Instanzen hinzu.\n"
-"lxc config trust remove [remote] [hostname|fingerprint]\n"
-"               Löscht das Zertifikat aus der Liste der vertrauenswürdigen.\n"
-"\n"
-"Beispiele:\n"
-"Zum mounten von /share/c1 des Hosts nach /opt im Container:\n"
-"\tlxc config device add container1 mntdir disk source=/share/c1 path=opt\n"
-"Um einen lxc config Wert zu setzen:\n"
-"\tlxc config set <container> raw.lxc 'lxc.aa_allow_incomplete = 1'\n"
-"Um das Server Passwort zur authentifizierung zu setzen:\n"
-"\tlxc config set core.trust_password blah\n"
-
-#: lxc/file.go:36
-#, fuzzy
-msgid ""
-"Manage files in a container.\n"
-"\n"
-"lxc file pull [-r|--recursive] [<remote>:]<container> "
-"[[<remote>:]<container>...] <target path>\n"
-"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
-"mode=MODE] <source path> [<source path>...] [<remote>:]<container>\n"
-"lxc file delete [<remote>:]<container> [[<remote>:]<container>...]\n"
-"lxc file edit [<remote>:]<container>/<path>\n"
-"\n"
-"<source> in the case of pull, <target> in the case of push and <file> in the "
-"case of edit are <container name>/<path>\n"
-"\n"
-"Examples:\n"
-"To push /etc/hosts into the container foo:\n"
-"    lxc file push /etc/hosts foo/etc/hosts\n"
-"\n"
-"To pull /etc/hosts from the container:\n"
-"    lxc file pull foo/etc/hosts ."
-msgstr ""
-"Verwaltet Dateien in einem Container.\n"
-"\n"
-"lxc file pull <Quelle> [<Quelle>...] <Ziel>\n"
-"lxc file push [--uid=UID] [--gid=GID] [--mode=MODE] <Quelle> [<Quelle>...] "
-"<Ziel>\n"
-"\n"
-"<Quelle> bei pull und <Ziel> bei push sind jeweils von der Form <Container "
-"Name>/<Pfad>\n"
-
-#: lxc/network.go:49
-msgid ""
-"Manage networks.\n"
-"\n"
-"lxc network list [<remote>:]                              List available "
-"networks.\n"
-"lxc network show [<remote>:]<network>                     Show details of a "
-"network.\n"
-"lxc network create [<remote>:]<network> [key=value...]    Create a network.\n"
-"lxc network get [<remote>:]<network> <key>                Get network "
-"configuration.\n"
-"lxc network set [<remote>:]<network> <key> <value>        Set network "
-"configuration.\n"
-"lxc network unset [<remote>:]<network> <key>              Unset network "
-"configuration.\n"
-"lxc network delete [<remote>:]<network>                   Delete a network.\n"
-"lxc network edit [<remote>:]<network>\n"
-"    Edit network, either by launching external editor or reading STDIN.\n"
-"    Example: lxc network edit <network> # launch editor\n"
-"             cat network.yaml | lxc network edit <network> # read from "
-"network.yaml\n"
-"\n"
-"lxc network attach [<remote>:]<network> <container> [device name] [interface "
-"name]\n"
-"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
-"[interface name]\n"
-"\n"
-"lxc network detach [<remote>:]<network> <container> [device name]\n"
-"lxc network detach-profile [<remote>:]<network> <container> [device name]"
-msgstr ""
-
-#: lxc/remote.go:37
-#, fuzzy
-msgid ""
-"Manage remote LXD servers.\n"
-"\n"
-"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
-"password=PASSWORD]\n"
-"                                        [--public] [--protocol=PROTOCOL]    "
-"Add the remote <remote> at <url>.\n"
-"lxc remote remove <remote>                                                  "
-"Remove the remote <remote>.\n"
-"lxc remote list                                                             "
-"List all remotes.\n"
-"lxc remote rename <old name> <new name>                                     "
-"Rename remote <old name> to <new name>.\n"
-"lxc remote set-url <remote> <url>                                           "
-"Update <remote>'s url to <url>.\n"
-"lxc remote set-default <remote>                                             "
-"Set the default remote.\n"
-"lxc remote get-default                                                      "
-"Print the default remote."
-msgstr ""
-"Verwalte entfernte LXD Server.\n"
-"\n"
-"lxc remote add <Name> <url> [--accept-certificate] [--password=PASSWORT]  "
-"Fügt die Instanz <Name> auf <URL> hinzu.\n"
-"lxc remote remove <Name>                                                  "
-"Entfernt die Instanz <Name>.\n"
-"lxc remote list                                                           "
-"Listet alle entfernte Instanzen.\n"
-"lxc remote rename <alt> <neu>                                             "
-"Benennt Instanz von <alt> nach <neu> um.\n"
-"lxc remote set-url <Name> <url>                                           "
-"Setzt die URL von <Name> auf <url>.\n"
-"lxc remote set-default <Name>                                             "
-"Setzt die Standard Instanz.\n"
-"lxc remote get-default                                                    "
-"Gibt die Standard Instanz aus.\n"
-
-#: lxc/storage.go:61
-msgid ""
-"Manage storage.\n"
-"\n"
-"lxc storage list [<remote>:]                                    List "
-"available storage pools.\n"
-"lxc storage show [<remote>:]<pool>                              Show details "
-"of a storage pool.\n"
-"lxc storage create [<remote>:]<pool> <driver> [key=value]...    Create a "
-"storage pool.\n"
-"lxc storage get [<remote>:]<pool> <key>                         Get storage "
-"pool configuration.\n"
-"lxc storage set [<remote>:]<pool> <key> <value>                 Set storage "
-"pool configuration.\n"
-"lxc storage unset [<remote>:]<pool> <key>                       Unset "
-"storage pool configuration.\n"
-"lxc storage delete [<remote>:]<pool>                            Delete a "
-"storage pool.\n"
-"lxc storage edit [<remote>:]<pool>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage edit [<remote>:]<pool> # launch editor\n"
-"             cat pool.yaml | lxc storage edit [<remote>:]<pool> # read from "
-"pool.yaml\n"
-"\n"
-"lxc storage volume list [<remote>:]<pool>                              List "
-"available storage volumes on a storage pool.\n"
-"lxc storage volume show [<remote>:]<pool> <volume>                     Show "
-"details of a storage volume on a storage pool.\n"
-"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...    "
-"Create a storage volume on a storage pool.\n"
-"lxc storage volume get [<remote>:]<pool> <volume> <key>                Get "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>        Set "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume unset [<remote>:]<pool> <volume> <key>              Unset "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume delete [<remote>:]<pool> <volume>                   "
-"Delete a storage volume on a storage pool.\n"
-"lxc storage volume edit [<remote>:]<pool> <volume>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage volume edit [<remote>:]<pool> <volume> # launch "
-"editor\n"
-"             cat pool.yaml | lxc storage volume edit [<remote>:]<pool> "
-"<volume> # read from pool.yaml\n"
-"\n"
-"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
-"name] <path>\n"
-"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name] <path>\n"
-"\n"
-"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
-"name]\n"
-"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name]\n"
-"\n"
-"\n"
-"Unless specified through a prefix, all volume operations affect \"custom"
-"\" (user created) volumes.\n"
-"\n"
-"Examples:\n"
-"To show the properties of a custom volume called \"data\" in the \"default\" "
-"pool:\n"
-"    lxc storage volume show default data\n"
-"\n"
-"To show the properties of the filesystem for a container called \"data\" in "
-"the \"default\" pool:\n"
-"    lxc storage volume show default container/data\n"
-msgstr ""
-
-#: lxc/image.go:62
-msgid ""
-"Manipulate container images.\n"
-"\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
-"server.\n"
-"\n"
-"When using remote images, LXD will automatically cache images for you\n"
-"and remove them upon expiration.\n"
-"\n"
-"The image unique identifier is the hash (sha-256) of its representation\n"
-"as a compressed tarball (or for split images, the concatenation of the\n"
-"metadata and rootfs tarballs).\n"
-"\n"
-"Images can be referenced by their full hash, shortest unique partial\n"
-"hash or alias name (if one is set).\n"
-"\n"
-"\n"
-"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
-"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
-"[--alias=ALIAS...] [prop=value]\n"
-"    Import an image tarball (or tarballs) into the LXD image store.\n"
-"\n"
-"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-"
-"aliases] [--public] [--auto-update]\n"
-"    Copy an image from one LXD daemon to another over the network.\n"
-"\n"
-"    The auto-update flag instructs the server to keep this image up to\n"
-"    date. It requires the source to be an alias and for it to be public.\n"
-"\n"
-"lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
-"    Delete one or more images from the LXD image store.\n"
-"\n"
-"lxc image export [<remote>:]<image> [target]\n"
-"    Export an image from the LXD image store into a distributable tarball.\n"
-"\n"
-"    The output target is optional and defaults to the working directory.\n"
-"    The target may be an existing directory, file name, or \"-\" to specify\n"
-"    stdout.  The target MUST be a directory when exporting a split image.\n"
-"    If the target is a directory, the image's name (each part's name for\n"
-"    split images) as found in the database will be used for the exported\n"
-"    image.  If the target is a file (not a directory and not stdout), then\n"
-"    the appropriate extension will be appended to the provided file name\n"
-"    based on the algorithm used to compress the image. \n"
-"\n"
-"lxc image info [<remote>:]<image>\n"
-"    Print everything LXD knows about a given image.\n"
-"\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
-"    List images in the LXD image store. Filters may be of the\n"
-"    <key>=<value> form for property based filtering, or part of the image\n"
-"    hash or part of the image alias name.\n"
-"\n"
-"lxc image show [<remote>:]<image>\n"
-"    Yaml output of the user modifiable properties of an image.\n"
-"\n"
-"lxc image edit [<remote>:]<image>\n"
-"    Edit image, either by launching external editor or reading STDIN.\n"
-"    Example: lxc image edit <image> # launch editor\n"
-"             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
-"\n"
-"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
-"    Create a new alias for an existing image.\n"
-"\n"
-"lxc image alias delete [<remote>:]<alias>\n"
-"    Delete an alias.\n"
-"\n"
-"lxc image alias list [<remote>:] [filter]\n"
-"    List the aliases. Filters may be part of the image hash or part of the "
-"image alias name."
-msgstr ""
-
-#: lxc/info.go:161
-msgid "Memory (current)"
-msgstr ""
-
-#: lxc/info.go:165
-msgid "Memory (peak)"
+msgid "Must supply container name for: "
+msgstr "der Name des Ursprung Containers muss angegeben werden"
+
+#: lxc/list.go:433 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:394
+#: lxc/storage.go:607 lxc/storage.go:687
+msgid "NAME"
 msgstr ""
 
-#: lxc/info.go:177
-msgid "Memory usage:"
-msgstr ""
-
-#: lxc/help.go:87
-msgid "Missing summary."
-msgstr "Fehlende Zusammenfassung."
-
-#: lxc/monitor.go:41
-msgid ""
-"Monitor activity on the LXD server.\n"
-"\n"
-"lxc monitor [<remote>:] [--type=TYPE...]\n"
-"\n"
-"Connects to the monitoring interface of the specified LXD server.\n"
-"\n"
-"By default will listen to all message types.\n"
-"Specific types to listen to can be specified with --type.\n"
-"\n"
-"Example:\n"
-"    lxc monitor --type=logging"
-msgstr ""
-
-#: lxc/network.go:224 lxc/network.go:273 lxc/storage.go:324 lxc/storage.go:424
-msgid "More than one device matches, specify the device name."
-msgstr ""
-
-#: lxc/file.go:274
-msgid "More than one file to download, but target is not a directory"
-msgstr ""
-"Mehr als eine Datei herunterzuladen, aber das Ziel ist kein Verzeichnis"
-
-#: lxc/move.go:16
-#, fuzzy
-msgid ""
-"Move containers within or in between lxd instances.\n"
-"\n"
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
-"    Move a container between two hosts, renaming it if destination name "
-"differs.\n"
-"\n"
-"lxc move <old name> <new name>\n"
-"    Rename a local container.\n"
-"\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
-"    Rename a snapshot."
-msgstr ""
-"Verschiebt Container innerhalb einer oder zwischen lxd Instanzen\n"
-"\n"
-"lxc move <Quelle> <Ziel>\n"
-
-#: lxc/action.go:67
-#, fuzzy
-msgid "Must supply container name for: "
-msgstr "der Name des Ursprung Containers muss angegeben werden"
-
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
-#: lxc/storage.go:569 lxc/storage.go:649
-msgid "NAME"
-msgstr ""
-
-#: lxc/network.go:420 lxc/remote.go:354 lxc/remote.go:359
+#: lxc/network.go:444 lxc/remote.go:368 lxc/remote.go:373
 msgid "NO"
 msgstr ""
 
-#: lxc/info.go:89
+#: lxc/info.go:91
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/network.go:198
+#: lxc/network.go:222
 #, fuzzy, c-format
 msgid "Network %s created"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/network.go:301
+#: lxc/network.go:325
 #, fuzzy, c-format
 msgid "Network %s deleted"
 msgstr "Profil %s gelöscht\n"
 
-#: lxc/init.go:143 lxc/init.go:144
+#: lxc/init.go:141 lxc/init.go:142
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:196
 #, fuzzy
 msgid "Network usage:"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/image.go:134 lxc/publish.go:35
+#: lxc/image.go:136 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/config.go:285
+#: lxc/config.go:321
 #, fuzzy
 msgid "No certificate provided to add"
 msgstr "Kein Zertifikat zum hinzufügen bereitgestellt"
 
-#: lxc/network.go:233 lxc/network.go:282
+#: lxc/network.go:257 lxc/network.go:306
 #, fuzzy
 msgid "No device found for this network"
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/storage.go:333 lxc/storage.go:433
+#: lxc/storage.go:371 lxc/storage.go:471
 #, fuzzy
 msgid "No device found for this storage volume."
 msgstr "Kein Zertifikat für diese Verbindung"
 
-#: lxc/config.go:308
+#: lxc/config.go:344
 msgid "No fingerprint specified."
 msgstr "Kein Fingerabdruck angegeben."
 
-#: lxc/storage.go:285 lxc/storage.go:369
+#: lxc/storage.go:323 lxc/storage.go:407
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:120
+#: lxc/remote.go:134
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:396
+#: lxc/image.go:398
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
-#: lxc/network.go:330 lxc/network.go:457
+#: lxc/network.go:354 lxc/network.go:481
 msgid "Only managed networks can be modified."
 msgstr ""
 
-#: lxc/help.go:63 lxc/main.go:112
+#: lxc/help.go:71 lxc/main.go:112 lxc/main.go:163
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:507
+#: lxc/image.go:509
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -1430,256 +720,226 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:556
+#: lxc/list.go:580
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:410
+#: lxc/list.go:434
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:411
+#: lxc/list.go:435
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:382
+#: lxc/remote.go:396
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:609 lxc/remote.go:383
+#: lxc/image.go:611 lxc/remote.go:397
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:188
+#: lxc/info.go:190
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:189
+#: lxc/info.go:191
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/help.go:70
+#: lxc/help.go:78
 #, fuzzy
 msgid "Path to an alternate client configuration directory"
 msgstr "Alternatives config Verzeichnis."
 
-#: lxc/help.go:71
+#: lxc/help.go:79
 #, fuzzy
 msgid "Path to an alternate server directory"
 msgstr "Alternatives config Verzeichnis."
 
-#: lxc/main.go:31
+#: lxc/main.go:202
+#, fuzzy
+msgid "Pause containers."
+msgstr "kann nicht zum selben Container Namen kopieren"
+
+#: lxc/main.go:34
 msgid "Permission denied, are you in the lxd group?"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:108
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/network.go:355 lxc/profile.go:219 lxc/storage.go:498 lxc/storage.go:803
+#: lxc/network.go:379 lxc/profile.go:258 lxc/storage.go:536 lxc/storage.go:841
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:536 lxc/config.go:601 lxc/image.go:704
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:706
 msgid "Press enter to start the editor again"
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "Print all the subcommands help."
-msgstr ""
-
-#: lxc/help.go:65
+#: lxc/help.go:73
 msgid "Print debug information"
 msgstr ""
 
-#: lxc/help.go:64
+#: lxc/help.go:72
 msgid "Print less common commands"
 msgstr ""
 
-#: lxc/help.go:66
+#: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
 
-#: lxc/version.go:18
-#, fuzzy
-msgid ""
-"Prints the version number of this client tool.\n"
-"\n"
-"lxc version"
-msgstr ""
-"Zeigt die Versionsnummer von LXD.\n"
-"\n"
-"lxc version\n"
-
-#: lxc/info.go:130
+#: lxc/info.go:132
 #, fuzzy, c-format
 msgid "Processes: %d"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/profile.go:275
+#: lxc/profile.go:314
 #, fuzzy, c-format
 msgid "Profile %s added to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
 
-#: lxc/profile.go:170
+#: lxc/profile.go:209
 #, fuzzy, c-format
 msgid "Profile %s created"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/profile.go:240
+#: lxc/profile.go:279
 #, fuzzy, c-format
 msgid "Profile %s deleted"
 msgstr "Profil %s gelöscht\n"
 
-#: lxc/profile.go:306
+#: lxc/profile.go:345
 #, fuzzy, c-format
 msgid "Profile %s removed from %s"
 msgstr "Gerät %s wurde von %s entfernt\n"
 
-#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:139 lxc/init.go:140
+#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:137 lxc/init.go:138
 #, fuzzy
 msgid "Profile to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/profile.go:256
+#: lxc/profile.go:295
 #, fuzzy, c-format
 msgid "Profiles %s applied to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
 
-#: lxc/info.go:104
+#: lxc/info.go:106
 #, fuzzy, c-format
 msgid "Profiles: %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/image.go:330
+#: lxc/image.go:332
 #, fuzzy
 msgid "Properties:"
 msgstr "Eigenschaften:\n"
 
-#: lxc/remote.go:54
+#: lxc/remote.go:68
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:313
+#: lxc/image.go:315
 #, fuzzy, c-format
 msgid "Public: %s"
 msgstr "Öffentlich: %s\n"
 
-#: lxc/publish.go:27
-msgid ""
-"Publish containers as images.\n"
-"\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
-msgstr ""
-
-#: lxc/file.go:58 lxc/file.go:59
+#: lxc/file.go:65 lxc/file.go:66
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/remote.go:52
+#: lxc/remote.go:66
 msgid "Remote admin password"
 msgstr "Entferntes Administrator Passwort"
 
-#: lxc/info.go:91
+#: lxc/info.go:93
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/delete.go:43
+#: lxc/delete.go:41
 #, c-format
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/delete.go:37 lxc/delete.go:38
+#: lxc/delete.go:35 lxc/delete.go:36
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:129
 msgid "Resources:"
 msgstr ""
 
-#: lxc/restore.go:21
-msgid ""
-"Restore a container's state to a previous snapshot.\n"
-"\n"
-"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
-"\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
-"\n"
-"Examples:\n"
-"Create the snapshot:\n"
-"    lxc snapshot u1 snap0\n"
-"\n"
-"Restore the snapshot:\n"
-"    lxc restore u1 snap0"
-msgstr ""
+#: lxc/main.go:210
+#, fuzzy
+msgid "Restart containers."
+msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/init.go:256
+#: lxc/init.go:254
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:612
+#: lxc/image.go:614
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:412
+#: lxc/list.go:436
 msgid "SNAPSHOTS"
 msgstr ""
 
-#: lxc/storage.go:571
+#: lxc/storage.go:609
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:413
+#: lxc/list.go:437
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:384
+#: lxc/remote.go:398
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:415
+#: lxc/list.go:439
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:225
+#: lxc/remote.go:239
 msgid "Server certificate NACKed by user"
 msgstr "Server Zertifikat vom Benutzer nicht akzeptiert"
 
-#: lxc/remote.go:287
+#: lxc/remote.go:301
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 "Der Server vertraut uns nicht nachdem er unser Zertifikat hinzugefügt hat"
 
-#: lxc/remote.go:53
+#: lxc/remote.go:67
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
-#: lxc/file.go:56
+#: lxc/file.go:63
 msgid "Set the file's gid on push"
 msgstr "Setzt die gid der Datei beim Übertragen"
 
-#: lxc/file.go:57
+#: lxc/file.go:64
 msgid "Set the file's perms on push"
 msgstr "Setzt die Dateiberechtigungen beim Übertragen"
 
-#: lxc/file.go:55
+#: lxc/file.go:62
 msgid "Set the file's uid on push"
 msgstr "Setzt die uid der Datei beim Übertragen"
 
-#: lxc/help.go:32
+#: lxc/help.go:29
 msgid "Show all commands (not just interesting ones)"
 msgstr "Zeigt alle Befehle (nicht nur die interessanten)"
 
-#: lxc/help.go:67
+#: lxc/help.go:75
 msgid "Show client version"
 msgstr ""
 
-#: lxc/info.go:36
+#: lxc/info.go:38
 msgid "Show the container's last 100 log lines?"
 msgstr "Zeige die letzten 100 Zeilen Protokoll des Containers?"
 
@@ -1687,85 +947,95 @@ msgstr "Zeige die letzten 100 Zeilen Protokoll des Containers?"
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:311
+#: lxc/image.go:313
 #, fuzzy, c-format
 msgid "Size: %.2fMB"
 msgstr "Größe: %.2vMB\n"
 
-#: lxc/info.go:208
+#: lxc/info.go:210
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/action.go:133
+#: lxc/action.go:134
 #, fuzzy, c-format
 msgid "Some containers failed to %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/image.go:340
+#: lxc/image.go:342
 msgid "Source:"
 msgstr ""
 
-#: lxc/launch.go:148
+#: lxc/main.go:220
+#, fuzzy
+msgid "Start containers."
+msgstr "kann nicht zum selben Container Namen kopieren"
+
+#: lxc/launch.go:146
 #, c-format
 msgid "Starting %s"
 msgstr ""
 
-#: lxc/info.go:98
+#: lxc/info.go:100
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
+#: lxc/main.go:226
+#, fuzzy
+msgid "Stop containers."
+msgstr "Anhalten des Containers fehlgeschlagen!"
+
 #: lxc/publish.go:36 lxc/publish.go:37
 msgid "Stop the container if currently running"
 msgstr ""
 
-#: lxc/delete.go:107 lxc/publish.go:114
+#: lxc/delete.go:105 lxc/publish.go:114
 msgid "Stopping container failed!"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/storage.go:398
+#: lxc/storage.go:436
 #, fuzzy, c-format
 msgid "Storage pool %s created"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/storage.go:448
+#: lxc/storage.go:486
 #, fuzzy, c-format
 msgid "Storage pool %s deleted"
 msgstr "Profil %s gelöscht\n"
 
-#: lxc/init.go:145 lxc/init.go:146
+#: lxc/init.go:143 lxc/init.go:144
 #, fuzzy
 msgid "Storage pool name"
 msgstr "Profilname kann nicht geändert werden"
 
-#: lxc/storage.go:672
+#: lxc/storage.go:710
 #, fuzzy, c-format
 msgid "Storage volume %s created"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/storage.go:682
+#: lxc/storage.go:720
 #, fuzzy, c-format
 msgid "Storage volume %s deleted"
 msgstr "Profil %s gelöscht\n"
 
-#: lxc/action.go:48
+#: lxc/action.go:49
 #, fuzzy
 msgid "Store the container state (only for stop)"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/info.go:169
+#: lxc/info.go:171
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:173
+#: lxc/info.go:175
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:414 lxc/network.go:435 lxc/storage.go:648
+#: lxc/list.go:438 lxc/network.go:459 lxc/storage.go:686
 msgid "TYPE"
 msgstr ""
 
-#: lxc/delete.go:93
+#: lxc/delete.go:91
 msgid "The container is currently running, stop it first or pass --force."
 msgstr ""
 
@@ -1775,31 +1045,31 @@ msgid ""
 "restarted."
 msgstr ""
 
-#: lxc/init.go:329
+#: lxc/init.go:327
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
-#: lxc/config.go:680 lxc/config.go:692 lxc/config.go:725 lxc/config.go:743
-#: lxc/config.go:781 lxc/config.go:799
+#: lxc/config.go:716 lxc/config.go:728 lxc/config.go:761 lxc/config.go:779
+#: lxc/config.go:817 lxc/config.go:835
 #, fuzzy
 msgid "The device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/init.go:313
+#: lxc/init.go:311
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/main.go:181
-msgid "The opposite of `lxc pause` is `lxc start`."
+#: lxc/action.go:34
+msgid "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/network.go:238 lxc/network.go:287 lxc/storage.go:338 lxc/storage.go:438
+#: lxc/network.go:262 lxc/network.go:311 lxc/storage.go:376 lxc/storage.go:476
 #, fuzzy
 msgid "The specified device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/network.go:242 lxc/network.go:291
+#: lxc/network.go:266 lxc/network.go:315
 #, fuzzy
 msgid "The specified device doesn't match the network"
 msgstr "entfernte Instanz %s existiert nicht"
@@ -1808,88 +1078,949 @@ msgstr "entfernte Instanz %s existiert nicht"
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
-#: lxc/action.go:44
+#: lxc/help.go:47
+msgid ""
+"This is the LXD command line client.\n"
+"\n"
+"All of LXD's features can be driven through the various commands below.\n"
+"For help with any of those, simply call them with --help."
+msgstr ""
+
+#: lxc/action.go:45
 #, fuzzy
 msgid "Time to wait for the container before killing it"
 msgstr "Wartezeit bevor der Container gestoppt wird."
 
-#: lxc/image.go:314
+#: lxc/image.go:316
 #, fuzzy
 msgid "Timestamps:"
 msgstr "Zeitstempel:\n"
 
-#: lxc/init.go:331
+#: lxc/init.go:329
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:330
+#: lxc/init.go:328
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
-#: lxc/main.go:137
+#: lxc/main.go:140
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:398
+#: lxc/image.go:400
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/action.go:97 lxc/launch.go:161
-#, c-format
-msgid "Try `lxc info --show-log %s` for more info"
+#: lxc/action.go:98 lxc/launch.go:159
+#, c-format
+msgid "Try `lxc info --show-log %s` for more info"
+msgstr ""
+
+#: lxc/info.go:102
+msgid "Type: ephemeral"
+msgstr ""
+
+#: lxc/info.go:104
+msgid "Type: persistent"
+msgstr ""
+
+#: lxc/image.go:615
+msgid "UPLOAD DATE"
+msgstr ""
+
+#: lxc/remote.go:395
+msgid "URL"
+msgstr ""
+
+#: lxc/network.go:461 lxc/profile.go:500 lxc/storage.go:610 lxc/storage.go:688
+msgid "USED BY"
+msgstr ""
+
+#: lxc/manpage.go:36
+msgid "Unable to find help2man."
+msgstr ""
+
+#: lxc/remote.go:109
+msgid "Unable to read remote TLS certificate"
+msgstr ""
+
+#: lxc/image.go:321
+#, c-format
+msgid "Uploaded: %s"
+msgstr ""
+
+#: lxc/action.go:37
+#, fuzzy, c-format
+msgid ""
+"Usage: lxc %s [<remote>:]<container> [[<remote>:]<container>...]\n"
+"\n"
+"%s%s"
+msgstr ""
+"Ändert den Laufzustand eines Containers in %s.\n"
+"\n"
+"lxd %s <Name>\n"
+
+#: lxc/help.go:45
+#, fuzzy
+msgid "Usage: lxc <command> [options]"
+msgstr ""
+"Benutzung: lxc [Unterbefehl] [Optionen]\n"
+"Verfügbare Befehle:\n"
+
+#: lxc/config.go:58
+#, fuzzy
+msgid ""
+"Usage: lxc config <subcommand> [options]\n"
+"\n"
+"Change container or server configuration options.\n"
+"\n"
+"*Container configuration*\n"
+"\n"
+"lxc config get [<remote>:][container] <key>\n"
+"    Get container or server configuration key.\n"
+"\n"
+"lxc config set [<remote>:][container] <key> <value>\n"
+"    Set container or server configuration key.\n"
+"\n"
+"lxc config unset [<remote>:][container] <key>\n"
+"    Unset container or server configuration key.\n"
+"\n"
+"lxc config show [<remote>:][container] [--expanded]\n"
+"    Show container or server configuration.\n"
+"\n"
+"lxc config edit [<remote>:][container]\n"
+"    Edit configuration, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Device management*\n"
+"\n"
+"lxc config device add [<remote>:]<container> <device> <type> [key=value...]\n"
+"    Add a device to a container.\n"
+"\n"
+"lxc config device get [<remote>:]<container> <device> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc config device set [<remote>:]<container> <device> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc config device unset [<remote>:]<container> <device> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc config device list [<remote>:]<container>\n"
+"    List devices for container.\n"
+"\n"
+"lxc config device show [<remote>:]<container>\n"
+"    Show full device details for container.\n"
+"\n"
+"lxc config device remove [<remote>:]<container> <name>\n"
+"    Remove device from container.\n"
+"\n"
+"*Client trust store management*\n"
+"\n"
+"lxc config trust list [<remote>:]\n"
+"    List all trusted certs.\n"
+"\n"
+"lxc config trust add [<remote>:] <certfile.crt>\n"
+"    Add certfile.crt to trusted hosts.\n"
+"\n"
+"lxc config trust remove [<remote>:] [hostname|fingerprint]\n"
+"    Remove the cert from trusted hosts.\n"
+"\n"
+"*Examples*\n"
+"\n"
+"cat config.yaml | lxc config edit <container>\n"
+"    Update the container configuration from config.yaml.\n"
+"\n"
+"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the container.\n"
+"\n"
+"lxc config set [<remote>:]<container> limits.cpu 2\n"
+"    Will set a CPU limit of \"2\" for the container.\n"
+"\n"
+"lxc config set core.https_address [::]:8443\n"
+"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"\n"
+"lxc config set core.trust_password blah\n"
+"    Will set the server's trust password to blah."
+msgstr ""
+"Verwalte Konfiguration.\n"
+"\n"
+"lxc config device add <Container> <Name> <Type> [key=value]...\n"
+"               Füge ein Gerät zu einem Container hinzu\n"
+"lxc config device list <Container>                     Listet die Geräte des "
+"Containers\n"
+"lxc config device show <Container>                     Zeigt alle Geräte "
+"Details für den Container\n"
+"lxc config device remove <Container> <Name>            Entfernt Gerät vom "
+"Container\n"
+"lxc config edit <Container>                            Bearbeite Container "
+"Konfiguration in externem Editor\n"
+"lxc config get <Container> key                         Holt "
+"Konfigurationsschlüssel\n"
+"lxc config set <Container> key [value]                 Setzt Container "
+"Konfigurationsschlüssel\n"
+"lxc config show <Container>                            Zeigt Konfiguration "
+"des Containers\n"
+"lxc config trust list [remote]                         Liste alle "
+"vertrauenswürdigen Zertifikate.\n"
+"lxc config trust add [remote] [certfile.crt]           Füge certfile.crt zu "
+"vertrauenden Instanzen hinzu.\n"
+"lxc config trust remove [remote] [hostname|fingerprint]\n"
+"               Löscht das Zertifikat aus der Liste der vertrauenswürdigen.\n"
+"\n"
+"Beispiele:\n"
+"Zum mounten von /share/c1 des Hosts nach /opt im Container:\n"
+"\tlxc config device add container1 mntdir disk source=/share/c1 path=opt\n"
+"Um einen lxc config Wert zu setzen:\n"
+"\tlxc config set <container> raw.lxc 'lxc.aa_allow_incomplete = 1'\n"
+"Um das Server Passwort zur authentifizierung zu setzen:\n"
+"\tlxc config set core.trust_password blah\n"
+
+#: lxc/copy.go:25
+#, fuzzy
+msgid ""
+"Usage: lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] "
+"[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]\n"
+"\n"
+"Copy containers within or in between LXD instances."
+msgstr ""
+"Kopiert Container innerhalb einer oder zwischen lxd Instanzen\n"
+"\n"
+"lxc copy <Quelle> <Ziel>\n"
+
+#: lxc/delete.go:26
+#, fuzzy
+msgid ""
+"Usage: lxc delete [<remote>:]<container>[/<snapshot>] "
+"[[<remote>:]<container>[/<snapshot>]...]\n"
+"\n"
+"Delete containers and snapshots."
+msgstr ""
+"Löscht einen Container oder Container Sicherungspunkt.\n"
+"\n"
+"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
+"Daten (Konfiguration, Sicherungspunkte, ...).\n"
+
+#: lxc/exec.go:46
+#, fuzzy
+msgid ""
+"Usage: lxc exec [<remote>:]<container> [--mode=auto|interactive|non-"
+"interactive] [--env KEY=VALUE...] [--] <command line>\n"
+"\n"
+"Execute commands in containers.\n"
+"\n"
+"Mode defaults to non-interactive, interactive mode is selected if both stdin "
+"AND stdout are terminals (stderr is ignored)."
+msgstr ""
+"Führt den angegebenen Befehl in einem Container aus.\n"
+"\n"
+"lxc exec <Container> [--env EDITOR=/usr/bin/vim]... <Befehl>\n"
+
+#: lxc/file.go:36
+#, fuzzy
+msgid ""
+"Usage: lxc file <subcommand> [options]\n"
+"\n"
+"Manage files in containers.\n"
+"\n"
+"lxc file pull [-r|--recursive] [<remote>:]<container>/<path> "
+"[[<remote>:]<container>/<path>...] <target path>\n"
+"    Pull files from containers.\n"
+"\n"
+"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
+"mode=MODE] <source path> [<source path>...] [<remote>:]<container>/<path>\n"
+"    Push files into containers.\n"
+"\n"
+"lxc file delete [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"<path>...]\n"
+"    Delete files in containers.\n"
+"\n"
+"lxc file edit [<remote>:]<container>/<path>\n"
+"    Edit files in containers using the default text editor.\n"
+"\n"
+"*Examples*\n"
+"lxc file push /etc/hosts foo/etc/hosts\n"
+"   To push /etc/hosts into the container \"foo\".\n"
+"\n"
+"lxc file pull foo/etc/hosts .\n"
+"   To pull /etc/hosts from the container and write it to the current "
+"directory."
+msgstr ""
+"Verwaltet Dateien in einem Container.\n"
+"\n"
+"lxc file pull <Quelle> [<Quelle>...] <Ziel>\n"
+"lxc file push [--uid=UID] [--gid=GID] [--mode=MODE] <Quelle> [<Quelle>...] "
+"<Ziel>\n"
+"\n"
+"<Quelle> bei pull und <Ziel> bei push sind jeweils von der Form <Container "
+"Name>/<Pfad>\n"
+
+#: lxc/finger.go:15
+msgid ""
+"Usage: lxc finger [<remote>:]\n"
+"\n"
+"Check if the LXD server is alive."
+msgstr ""
+
+#: lxc/help.go:22
+msgid ""
+"Usage: lxc help [--all]\n"
+"\n"
+"Help page for the LXD client."
+msgstr ""
+
+#: lxc/image.go:62
+msgid ""
+"Usage: lxc image <subcommand> [options]\n"
+"\n"
+"Manipulate container images.\n"
+"\n"
+"In LXD containers are created from images. Those images were themselves\n"
+"either generated from an existing container or downloaded from an image\n"
+"server.\n"
+"\n"
+"When using remote images, LXD will automatically cache images for you\n"
+"and remove them upon expiration.\n"
+"\n"
+"The image unique identifier is the hash (sha-256) of its representation\n"
+"as a compressed tarball (or for split images, the concatenation of the\n"
+"metadata and rootfs tarballs).\n"
+"\n"
+"Images can be referenced by their full hash, shortest unique partial\n"
+"hash or alias name (if one is set).\n"
+"\n"
+"\n"
+"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
+"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
+"[--alias=ALIAS...] [prop=value]\n"
+"    Import an image tarball (or tarballs) into the LXD image store.\n"
+"\n"
+"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-"
+"aliases] [--public] [--auto-update]\n"
+"    Copy an image from one LXD daemon to another over the network.\n"
+"\n"
+"    The auto-update flag instructs the server to keep this image up to\n"
+"    date. It requires the source to be an alias and for it to be public.\n"
+"\n"
+"lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
+"    Delete one or more images from the LXD image store.\n"
+"\n"
+"lxc image export [<remote>:]<image> [target]\n"
+"    Export an image from the LXD image store into a distributable tarball.\n"
+"\n"
+"    The output target is optional and defaults to the working directory.\n"
+"    The target may be an existing directory, file name, or \"-\" to specify\n"
+"    stdout.  The target MUST be a directory when exporting a split image.\n"
+"    If the target is a directory, the image's name (each part's name for\n"
+"    split images) as found in the database will be used for the exported\n"
+"    image.  If the target is a file (not a directory and not stdout), then\n"
+"    the appropriate extension will be appended to the provided file name\n"
+"    based on the algorithm used to compress the image. \n"
+"\n"
+"lxc image info [<remote>:]<image>\n"
+"    Print everything LXD knows about a given image.\n"
+"\n"
+"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"    List images in the LXD image store. Filters may be of the\n"
+"    <key>=<value> form for property based filtering, or part of the image\n"
+"    hash or part of the image alias name.\n"
+"\n"
+"lxc image show [<remote>:]<image>\n"
+"    Yaml output of the user modifiable properties of an image.\n"
+"\n"
+"lxc image edit [<remote>:]<image>\n"
+"    Edit image, either by launching external editor or reading STDIN.\n"
+"    Example: lxc image edit <image> # launch editor\n"
+"             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
+"\n"
+"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
+"    Create a new alias for an existing image.\n"
+"\n"
+"lxc image alias delete [<remote>:]<alias>\n"
+"    Delete an alias.\n"
+"\n"
+"lxc image alias list [<remote>:] [filter]\n"
+"    List the aliases. Filters may be part of the image hash or part of the "
+"image alias name."
+msgstr ""
+
+#: lxc/info.go:25
+msgid ""
+"Usage: lxc info [<remote>:][<container>] [--show-log]\n"
+"\n"
+"Show container or server information.\n"
+"\n"
+"lxc info [<remote>:]<container> [--show-log]\n"
+"    For container information.\n"
+"\n"
+"lxc info [<remote>:]\n"
+"    For LXD server information."
+msgstr ""
+
+#: lxc/init.go:75
+#, fuzzy
+msgid ""
+"Usage: lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc init ubuntu:16.04 u1"
+msgstr ""
+"Starte Container von gegebenem Abbild.\n"
+"\n"
+"lxc launch <Abbild> [<Name>] [—ephemeral|-e] [—profile|-p <Profile>…]\n"
+"\n"
+"Startet einen Container von gegebenem Abbild und mit Namen\n"
+"\n"
+"Ohne den -p Parameter wird das default Profil benutzt.\n"
+"Wird -p ohne Argument angegeben, wird kein Profil verwendet\n"
+"\n"
+"Beispiel:\n"
+"lxc launch ubuntu u1\n"
+
+#: lxc/launch.go:23
+#, fuzzy
+msgid ""
+"Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create and start containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc launch ubuntu:16.04 u1"
+msgstr ""
+"Starte Container von gegebenem Abbild.\n"
+"\n"
+"lxc launch <Abbild> [<Name>] [—ephemeral|-e] [—profile|-p <Profile>…]\n"
+"\n"
+"Startet einen Container von gegebenem Abbild und mit Namen\n"
+"\n"
+"Ohne den -p Parameter wird das default Profil benutzt.\n"
+"Wird -p ohne Argument angegeben, wird kein Profil verwendet\n"
+"\n"
+"Beispiel:\n"
+"lxc launch ubuntu u1\n"
+
+#: lxc/list.go:47
+#, fuzzy
+msgid ""
+"Usage: lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] "
+"[--fast]\n"
+"\n"
+"List the existing containers.\n"
+"\n"
+"Default column layout: ns46tS\n"
+"Fast column layout: nsacPt\n"
+"\n"
+"*Filters*\n"
+"A single keyword like \"web\" which will list any container with a name "
+"starting by \"web\".\n"
+"\n"
+"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"\n"
+"A key/value pair referring to a configuration item. For those, the namespace "
+"can be abbreviated to the smallest unambiguous identifier.\n"
+"    - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"property set to \"abc\".\n"
+"\n"
+"    - \"u.blah=abc\" will do the same\n"
+"\n"
+"    - \"security.privileged=1\" will list all privileged containers\n"
+"\n"
+"    - \"s.privileged=1\" will do the same\n"
+"\n"
+"A regular expression matching a configuration item or its value. (e.g. "
+"volatile.eth0.hwaddr=00:16:3e:.*).\n"
+"\n"
+"*Columns*\n"
+"The -c option takes a comma separated list of arguments that control\n"
+"which container attributes to output when displaying in table format.\n"
+"\n"
+"Column arguments are either pre-defined shorthand chars (see below),\n"
+"or (extended) config keys.\n"
+"\n"
+"Commas between consecutive shorthand chars are optional.\n"
+"\n"
+"Pre-defined column shorthand chars:\n"
+"\n"
+"    4 - IPv4 address\n"
+"\n"
+"    6 - IPv6 address\n"
+"\n"
+"    a - Architecture\n"
+"\n"
+"    b - Storage pool\n"
+"\n"
+"    c - Creation date\n"
+"\n"
+"    l - Last used date\n"
+"\n"
+"    n - Name\n"
+"\n"
+"    p - PID of the container's init process\n"
+"\n"
+"    P - Profiles\n"
+"\n"
+"    s - State\n"
+"\n"
+"    S - Number of snapshots\n"
+"\n"
+"    t - Type (persistent or ephemeral)\n"
+"\n"
+"Custom columns are defined with \"key[:name][:maxWidth]\":\n"
+"\n"
+"    KEY: The (extended) config key to display\n"
+"\n"
+"    NAME: Name to display in the column header.\n"
+"    Defaults to the key if not specified or empty.\n"
+"\n"
+"    MAXWIDTH: Max width of the column (longer results are truncated).\n"
+"    Defaults to -1 (unlimited). Use 0 to limit to the column header size.\n"
+"\n"
+"*Examples*\n"
+"lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:"
+"MAC\n"
+"    Shows a list of containers using the \"NAME\", \"BASE IMAGE\", \"STATE"
+"\", \"IPV4\",\n"
+"    \"IPV6\" and \"MAC\" columns.\n"
+"\n"
+"    \"BASE IMAGE\" and \"MAC\" are custom columns generated from container "
+"configuration keys."
+msgstr ""
+"Listet vorhandene Ressourcen.\n"
+"\n"
+"lxc list [Resource] [Filter]\n"
+"\n"
+"Filter sind:\n"
+"* Ein einzelnes Schlüsselwort wie \"web“, was alle Container mit \"web\" im "
+"Namen listet.\n"
+"* Ein key/value Paar bezüglich eines Konfigurationsparameters. Dafür kann "
+"der Namensraum, solange eindeutig, abgekürzt werden:\n"
+"* \"user.blah=abc\" listet alle Container mit der \"blah\" Benutzer "
+"Eigenschaft \"abc\"\n"
+"* \"u.blah=abc\" ebenfalls\n"
+"* \"security.privileged=1\" listet alle privilegierten Container\n"
+"* \"s.privileged=1\" ebenfalls\n"
+
+#: lxc/manpage.go:20
+msgid ""
+"Usage: lxc manpage <directory>\n"
+"\n"
+"Generate all the LXD manpages."
+msgstr ""
+
+#: lxc/monitor.go:41
+msgid ""
+"Usage: lxc monitor [<remote>:] [--type=TYPE...]\n"
+"\n"
+"Monitor a local or remote LXD server.\n"
+"\n"
+"By default the monitor will listen to all message types.\n"
+"\n"
+"Message types to listen for can be specified with --type.\n"
+"\n"
+"*Examples*\n"
+"lxc monitor --type=logging\n"
+"    Only show log message."
 msgstr ""
 
-#: lxc/info.go:100
-msgid "Type: ephemeral"
+#: lxc/move.go:16
+#, fuzzy
+msgid ""
+"Usage: lxc move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]]\n"
+"\n"
+"Move containers within or in between LXD instances.\n"
+"\n"
+"lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
+"    Move a container between two hosts, renaming it if destination name "
+"differs.\n"
+"\n"
+"lxc move <old name> <new name>\n"
+"    Rename a local container.\n"
+"\n"
+"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"    Rename a snapshot."
 msgstr ""
+"Verschiebt Container innerhalb einer oder zwischen lxd Instanzen\n"
+"\n"
+"lxc move <Quelle> <Ziel>\n"
 
-#: lxc/info.go:102
-msgid "Type: persistent"
+#: lxc/network.go:49
+msgid ""
+"Usage: lxc network <subcommand> [options]\n"
+"\n"
+"Manage and attach containers to networks.\n"
+"\n"
+"lxc network list [<remote>:]\n"
+"    List available networks.\n"
+"\n"
+"lxc network show [<remote>:]<network>\n"
+"    Show details of a network.\n"
+"\n"
+"lxc network create [<remote>:]<network> [key=value...]\n"
+"    Create a network.\n"
+"\n"
+"lxc network get [<remote>:]<network> <key>\n"
+"    Get network configuration.\n"
+"\n"
+"lxc network set [<remote>:]<network> <key> <value>\n"
+"    Set network configuration.\n"
+"\n"
+"lxc network unset [<remote>:]<network> <key>\n"
+"    Unset network configuration.\n"
+"\n"
+"lxc network delete [<remote>:]<network>\n"
+"    Delete a network.\n"
+"\n"
+"lxc network edit [<remote>:]<network>\n"
+"    Edit network, either by launching external editor or reading STDIN.\n"
+"\n"
+"lxc network attach [<remote>:]<network> <container> [device name] [interface "
+"name]\n"
+"    Attach a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
+"[interface name]\n"
+"    Attach a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"*Examples*\n"
+"cat network.yaml | lxc network edit <network>\n"
+"    Update a network using the content of network.yaml"
 msgstr ""
 
-#: lxc/image.go:613
-msgid "UPLOAD DATE"
+#: lxc/profile.go:49
+#, fuzzy
+msgid ""
+"Usage: lxc profile <subcommand> [options]\n"
+"\n"
+"Manage container configuration profiles.\n"
+"\n"
+"*Profile configuration*\n"
+"lxc profile list [<remote>:]\n"
+"    List available profiles.\n"
+"\n"
+"lxc profile show [<remote>:]<profile>\n"
+"    Show details of a profile.\n"
+"\n"
+"lxc profile create [<remote>:]<profile>\n"
+"    Create a profile.\n"
+"\n"
+"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
+"    Copy the profile.\n"
+"\n"
+"lxc profile get [<remote>:]<profile> <key>\n"
+"    Get profile configuration.\n"
+"\n"
+"lxc profile set [<remote>:]<profile> <key> <value>\n"
+"    Set profile configuration.\n"
+"\n"
+"lxc profile unset [<remote>:]<profile> <key>\n"
+"    Unset profile configuration.\n"
+"\n"
+"lxc profile delete [<remote>:]<profile>\n"
+"    Delete a profile.\n"
+"\n"
+"lxc profile edit [<remote>:]<profile>\n"
+"    Edit profile, either by launching external editor or reading STDIN.\n"
+"\n"
+"*Profile assignment*\n"
+"lxc profile assign [<remote>:]<container> <profiles>\n"
+"    Replace the current set of profiles for the container by the one "
+"provided.\n"
+"\n"
+"lxc profile add [<remote>:]<container> <profile>\n"
+"    Add a profile to a container\n"
+"\n"
+"lxc profile remove [<remote>:]<container> <profile>\n"
+"    Remove the profile from a container\n"
+"\n"
+"*Device management*\n"
+"lxc profile device list [<remote>:]<profile>\n"
+"    List devices in the given profile.\n"
+"\n"
+"lxc profile device show [<remote>:]<profile>\n"
+"    Show full device details in the given profile.\n"
+"\n"
+"lxc profile device remove [<remote>:]<profile> <name>\n"
+"    Remove a device from a profile.\n"
+"\n"
+"lxc profile device get [<remote>:]<profile> <name> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc profile device unset [<remote>:]<profile> <name> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
+"    Add a profile device, such as a disk or a nic, to the containers using "
+"the specified profile.\n"
+"\n"
+"*Examples*\n"
+"cat profile.yaml | lxc profile edit <profile>\n"
+"    Update a profile using the content of profile.yaml\n"
+"\n"
+"lxc profile assign foo default,bar\n"
+"    Set the profiles for \"foo\" to \"default\" and \"bar\".\n"
+"\n"
+"lxc profile assign foo default\n"
+"    Reset \"foo\" to only using the \"default\" profile.\n"
+"\n"
+"lxc profile assign foo ''\n"
+"    Remove all profile from \"foo\""
 msgstr ""
+"Verwalte Konfigurationsprofile.\n"
+"\n"
+"lxc profile list [Filter]                     Listet verfügbare Profile\n"
+"lxc profile show <Profil>                     Zeigt Details zu einem Profil\n"
+"lxc profile create <Profil>                   Erstellt ein Profil\n"
+"lxc profile edit <Profil>                     Bearbeitet das Profil in "
+"externem Editor\n"
+"lxc profile copy <Profil> <remote>            Kopiert das Profil zur "
+"entfernten Instanz\n"
+"lxc profile set <Profil> <key> <value>        Setzt eine "
+"Profilkonfiguration\n"
+"lxc profile delete <Profil>                   Löscht ein Profil\n"
+"lxc profile apply <Container> <Profil>\n"
+"    Wendet eine durch Kommata getrennte Liste von Profilen,\n"
+"    in gegeben Reihenfolge, auf einen Container an.\n"
+"    Alle angegeben, und nur diese, werden auf den Container angewandt.\n"
+"    Beispiel: lxc profile apply foo default,bar # Wende default und bar an\n"
+"             lxc profile apply foo default # Nur default ist aktiv\n"
+"             lxc profile apply '' # keine Profile werden angewandt\n"
+"             lxc profile apply bar,default # Wende nun default als zweites "
+"an\n"
+"\n"
+"Geräte:\n"
+"lxc profile device list <Profil>              Listet Geräte im Profil\n"
+"lxc profile device show <Profil>              Zeigt alle Geräte Details im "
+"gegebenen Profil.\n"
+"lxc profile device remove <Profil> <name>     Entfernt ein Gerät von dem "
+"Profil.\n"
+"lxc profile device add <Profil name> <Gerätename> <Gerätetype> "
+"[key=value]...\n"
+"    Fügt ein Gerät, wie zum Beispiel eine Festplatte oder Netzwerkkarte, den "
+"Containern hinzu,\n"
+"    die dieses Profil verwenden.\n"
 
-#: lxc/remote.go:381
-msgid "URL"
+#: lxc/publish.go:27
+msgid ""
+"Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]\n"
+"\n"
+"Publish containers as images."
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
-msgid "USED BY"
+#: lxc/remote.go:37
+#, fuzzy
+msgid ""
+"Usage: lxc remote <subcommand> [options]\n"
+"\n"
+"Manage the list of remote LXD servers.\n"
+"\n"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
+"password=PASSWORD] [--public] [--protocol=PROTOCOL]\n"
+"    Add the remote <remote> at <url>.\n"
+"\n"
+"lxc remote remove <remote>\n"
+"    Remove the remote <remote>.\n"
+"\n"
+"lxc remote list\n"
+"    List all remotes.\n"
+"\n"
+"lxc remote rename <old name> <new name>\n"
+"    Rename remote <old name> to <new name>.\n"
+"\n"
+"lxc remote set-url <remote> <url>\n"
+"    Update <remote>'s url to <url>.\n"
+"\n"
+"lxc remote set-default <remote>\n"
+"    Set the default remote.\n"
+"\n"
+"lxc remote get-default\n"
+"    Print the default remote."
 msgstr ""
+"Verwalte entfernte LXD Server.\n"
+"\n"
+"lxc remote add <Name> <url> [--accept-certificate] [--password=PASSWORT]  "
+"Fügt die Instanz <Name> auf <URL> hinzu.\n"
+"lxc remote remove <Name>                                                  "
+"Entfernt die Instanz <Name>.\n"
+"lxc remote list                                                           "
+"Listet alle entfernte Instanzen.\n"
+"lxc remote rename <alt> <neu>                                             "
+"Benennt Instanz von <alt> nach <neu> um.\n"
+"lxc remote set-url <Name> <url>                                           "
+"Setzt die URL von <Name> auf <url>.\n"
+"lxc remote set-default <Name>                                             "
+"Setzt die Standard Instanz.\n"
+"lxc remote get-default                                                    "
+"Gibt die Standard Instanz aus.\n"
 
-#: lxc/remote.go:95
-msgid "Unable to read remote TLS certificate"
+#: lxc/restore.go:21
+msgid ""
+"Usage: lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"\n"
+"Restore containers from snapshots.\n"
+"\n"
+"If --stateful is passed, then the running state will be restored too.\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create the snapshot.\n"
+"\n"
+"lxc restore u1 snap0\n"
+"    Restore the snapshot."
 msgstr ""
 
-#: lxc/image.go:319
-#, c-format
-msgid "Uploaded: %s"
+#: lxc/snapshot.go:21
+msgid ""
+"Usage: lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"Create container snapshots.\n"
+"\n"
+"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"running state, including process memory state, TCP connections, ...\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create a snapshot of \"u1\" called \"snap0\"."
 msgstr ""
 
-#: lxc/main.go:112
-#, fuzzy, c-format
-msgid "Usage: %s"
-msgstr ""
-"Benutzung: %s\n"
+#: lxc/storage.go:61
+msgid ""
+"Usage: lxc storage <subcommand> [options]\n"
+"\n"
+"Manage storage pools and volumes.\n"
+"\n"
+"*Storage pools*\n"
+"lxc storage list [<remote>:]\n"
+"    List available storage pools.\n"
+"\n"
+"lxc storage show [<remote>:]<pool>\n"
+"    Show details of a storage pool.\n"
+"\n"
+"lxc storage create [<remote>:]<pool> <driver> [key=value]...\n"
+"    Create a storage pool.\n"
+"\n"
+"lxc storage get [<remote>:]<pool> <key>\n"
+"    Get storage pool configuration.\n"
+"\n"
+"lxc storage set [<remote>:]<pool> <key> <value>\n"
+"    Set storage pool configuration.\n"
+"\n"
+"lxc storage unset [<remote>:]<pool> <key>\n"
+"    Unset storage pool configuration.\n"
+"\n"
+"lxc storage delete [<remote>:]<pool>\n"
+"    Delete a storage pool.\n"
+"\n"
+"lxc storage edit [<remote>:]<pool>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Storage volumes*\n"
+"lxc storage volume list [<remote>:]<pool>\n"
+"    List available storage volumes on a storage pool.\n"
+"\n"
+"lxc storage volume show [<remote>:]<pool> <volume>\n"
+"    Show details of a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...\n"
+"    Create a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume get [<remote>:]<pool> <volume> <key>\n"
+"    Get storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>\n"
+"    Set storage volume configuration on a storage pool.\n"
 "\n"
-"Optionen:\n"
+"lxc storage volume unset [<remote>:]<pool> <volume> <key>\n"
+"    Unset storage volume configuration on a storage pool.\n"
 "\n"
+"lxc storage volume delete [<remote>:]<pool> <volume>\n"
+"    Delete a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
+"name] <path>\n"
+"    Attach a storage volume to the specified container.\n"
+"\n"
+"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name] <path>\n"
+"    Attach a storage volume to the specified profile.\n"
+"\n"
+"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
+"name]\n"
+"    Detach a storage volume from the specified container.\n"
+"\n"
+"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name]\n"
+"    Detach a storage volume from the specified profile.\n"
+"\n"
+"Unless specified through a prefix, all volume operations affect \"custom"
+"\" (user created) volumes.\n"
+"\n"
+"*Examples*\n"
+"cat pool.yaml | lxc storage edit [<remote>:]<pool>\n"
+"    Update a storage pool using the content of pool.yaml.\n"
+"\n"
+"cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Update a storage volume using the content of pool.yaml.\n"
+"\n"
+"lxc storage volume show default data\n"
+"    Will show the properties of a custom volume called \"data\" in the "
+"\"default\" pool.\n"
+"\n"
+"lxc storage volume show default container/data\n"
+"    Will show the properties of the filesystem for a container called \"data"
+"\" in the \"default\" pool."
+msgstr ""
 
-#: lxc/help.go:48
+#: lxc/version.go:18
 #, fuzzy
-msgid "Usage: lxc <command> [options]"
+msgid ""
+"Usage: lxc version\n"
+"\n"
+"Print the version number of this client tool."
 msgstr ""
-"Benutzung: lxc [Unterbefehl] [Optionen]\n"
-"Verfügbare Befehle:\n"
+"Zeigt die Versionsnummer von LXD.\n"
+"\n"
+"lxc version\n"
 
-#: lxc/delete.go:47
+#: lxc/delete.go:45
 msgid "User aborted delete operation."
 msgstr ""
 
-#: lxc/restore.go:38
+#: lxc/restore.go:37
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
 "available)"
@@ -1897,24 +2028,24 @@ msgstr ""
 "Laufenden Zustand des Containers aus dem Sicherungspunkt (falls vorhanden) "
 "wiederherstellen oder nicht"
 
-#: lxc/snapshot.go:38
+#: lxc/snapshot.go:35
 msgid "Whether or not to snapshot the container's running state"
 msgstr "Zustand des laufenden Containers sichern oder nicht"
 
-#: lxc/network.go:422 lxc/remote.go:356 lxc/remote.go:361
+#: lxc/network.go:446 lxc/remote.go:370 lxc/remote.go:375
 msgid "YES"
 msgstr ""
 
-#: lxc/main.go:52
+#: lxc/main.go:55
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/launch.go:132
+#: lxc/launch.go:130
 msgid "bad number of things scanned from image, container or snapshot"
 msgstr ""
 "Falsche Anzahl an Objekten im Abbild, Container oder Sicherungspunkt gelesen."
 
-#: lxc/action.go:93
+#: lxc/action.go:94
 msgid "bad result type from action"
 msgstr ""
 
@@ -1922,50 +2053,50 @@ msgstr ""
 msgid "can't copy to the same container name"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/file.go:309
+#: lxc/file.go:316
 msgid "can't pull a directory without --recursive"
 msgstr ""
 
-#: lxc/remote.go:344
+#: lxc/remote.go:358
 msgid "can't remove the default remote"
 msgstr ""
 
-#: lxc/file.go:120
+#: lxc/file.go:127
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:370
+#: lxc/remote.go:384
 msgid "default"
 msgstr ""
 
 #: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
-#: lxc/init.go:236 lxc/init.go:241 lxc/launch.go:116 lxc/launch.go:121
+#: lxc/init.go:234 lxc/init.go:239 lxc/launch.go:114 lxc/launch.go:119
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:305
+#: lxc/image.go:307
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:307
+#: lxc/image.go:309
 msgid "enabled"
 msgstr ""
 
-#: lxc/action.go:125 lxc/main.go:22 lxc/main.go:148
+#: lxc/action.go:126 lxc/main.go:25 lxc/main.go:159
 #, fuzzy, c-format
 msgid "error: %v"
 msgstr "Fehler: %v\n"
 
-#: lxc/help.go:40 lxc/main.go:107
+#: lxc/help.go:37 lxc/main.go:106
 #, fuzzy, c-format
 msgid "error: unknown command: %s"
 msgstr "Fehler: unbekannter Befehl: %s\n"
 
-#: lxc/launch.go:136
+#: lxc/launch.go:134
 msgid "got bad version"
 msgstr "Versionskonflikt"
 
-#: lxc/image.go:300 lxc/image.go:589
+#: lxc/image.go:302 lxc/image.go:591
 msgid "no"
 msgstr ""
 
@@ -1973,49 +2104,49 @@ msgstr ""
 msgid "not all the profiles from the source exist on the target"
 msgstr "nicht alle Profile der Quelle sind am Ziel vorhanden."
 
-#: lxc/remote.go:218
+#: lxc/remote.go:232
 #, fuzzy
 msgid "ok (y/n)?"
 msgstr "OK (y/n)? "
 
-#: lxc/main.go:305 lxc/main.go:309
+#: lxc/main.go:331 lxc/main.go:335
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
 
-#: lxc/file.go:376
+#: lxc/file.go:383
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:406
+#: lxc/remote.go:420
 #, c-format
 msgid "remote %s already exists"
 msgstr "entfernte Instanz %s existiert bereits"
 
-#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
+#: lxc/remote.go:350 lxc/remote.go:412 lxc/remote.go:447 lxc/remote.go:463
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/remote.go:319
+#: lxc/remote.go:333
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "entfernte Instanz %s existiert als <%s>"
 
-#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
+#: lxc/remote.go:354 lxc/remote.go:416 lxc/remote.go:451
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/info.go:219
+#: lxc/info.go:221
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:221
+#: lxc/info.go:223
 msgid "stateless"
 msgstr ""
 
-#: lxc/info.go:215
+#: lxc/info.go:217
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -2024,11 +2155,11 @@ msgstr ""
 msgid "unreachable return reached"
 msgstr ""
 
-#: lxc/main.go:237
+#: lxc/main.go:262
 msgid "wrong number of subcommand arguments"
 msgstr "falsche Anzahl an Parametern für Unterbefehl"
 
-#: lxc/delete.go:46 lxc/image.go:302 lxc/image.go:593
+#: lxc/delete.go:44 lxc/image.go:304 lxc/image.go:595
 msgid "yes"
 msgstr ""
 
@@ -2037,6 +2168,51 @@ msgid "you must specify a source container name"
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
 #, fuzzy
+#~ msgid ""
+#~ "Check if the LXD instance is up.\n"
+#~ "\n"
+#~ "lxc finger [<remote>:]"
+#~ msgstr ""
+#~ "Fingert die LXD Instanz zum überprüfen ob diese funktionsfähig ist.\n"
+#~ "\n"
+#~ "lxc finger <remote>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Help page for the LXD client.\n"
+#~ "\n"
+#~ "lxc help [--all]"
+#~ msgstr ""
+#~ "Zeigt Details über die Benutzung von LXD an.\n"
+#~ "\n"
+#~ "lxd help [—all]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "List information on LXD servers and containers.\n"
+#~ "\n"
+#~ "For a container:\n"
+#~ "    lxc info [<remote:>]<container> [--show-log]\n"
+#~ "\n"
+#~ "For a server:\n"
+#~ "    lxc info [<remote:>]"
+#~ msgstr ""
+#~ "Listet Informationen über Container.\n"
+#~ "\n"
+#~ "Dies wird entfernte Instanzen und Abbilder unterstützen, \n"
+#~ "zur Zeit jedoch nur Container.\n"
+#~ "\n"
+#~ "lxc info [<remote>:]Container [--show-log]\n"
+
+#, fuzzy
+#~ msgid "Usage: %s"
+#~ msgstr ""
+#~ "Benutzung: %s\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "\n"
+
+#, fuzzy
 #~ msgid "For example: 'lxd-images import ubuntu --alias ubuntu'."
 #~ msgstr "Zum Beispiel: 'lxd-images import ubuntu --alias ubuntu'.\n"
 
diff --git a/po/el.po b/po/el.po
index c1e2800..c7addc8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-03-05 02:20-0500\n"
+"POT-Creation-Date: 2017-03-05 02:21-0500\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -122,136 +122,121 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:586
+#: lxc/image.go:588
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/snapshot.go:61
+#: lxc/snapshot.go:58
 msgid "'/' not allowed in snapshot name"
 msgstr ""
 
-#: lxc/profile.go:254
+#: lxc/profile.go:293
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:607 lxc/image.go:649
+#: lxc/image.go:609 lxc/image.go:651
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:611
+#: lxc/image.go:613
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:406
+#: lxc/list.go:430
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:51
+#: lxc/remote.go:65
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:281
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:334
+#: lxc/image.go:336
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:312 lxc/info.go:93
+#: lxc/image.go:314 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:338
+#: lxc/image.go:340
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/help.go:49
-msgid "Available commands:"
-msgstr ""
-
-#: lxc/info.go:186
+#: lxc/info.go:188
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:187
+#: lxc/info.go:189
 msgid "Bytes sent"
 msgstr ""
 
-#: lxc/config.go:274
+#: lxc/config.go:310
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:150
+#: lxc/info.go:152
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:154
+#: lxc/info.go:156
 #, fuzzy
 msgid "CPU usage:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/list.go:407
+#: lxc/list.go:431
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/config.go:114 lxc/network.go:471
+#: lxc/config.go:150 lxc/network.go:495
 #, c-format
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/config.go:127 lxc/config.go:160 lxc/config.go:182
+#: lxc/config.go:163 lxc/config.go:196 lxc/config.go:218
 #, c-format
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
+#: lxc/network.go:422 lxc/profile.go:472 lxc/storage.go:579
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:217
+#: lxc/remote.go:231
 #, c-format
 msgid "Certificate fingerprint: %x"
 msgstr ""
 
-#: lxc/action.go:36
-#, c-format
-msgid ""
-"Change state of one or more containers to %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-msgstr ""
-
-#: lxc/finger.go:15
-msgid ""
-"Check if the LXD instance is up.\n"
-"\n"
-"lxc finger [<remote>:]"
-msgstr ""
-
-#: lxc/remote.go:290
+#: lxc/remote.go:304
 msgid "Client certificate stored at server: "
 msgstr ""
 
-#: lxc/list.go:101 lxc/list.go:102
+#: lxc/list.go:125 lxc/list.go:126
 msgid "Columns"
 msgstr ""
 
-#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:137 lxc/init.go:138
+#: lxc/help.go:53
+msgid "Commands:"
+msgstr ""
+
+#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:135 lxc/init.go:136
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:535 lxc/config.go:600 lxc/image.go:703 lxc/network.go:354
-#: lxc/profile.go:218 lxc/storage.go:497 lxc/storage.go:802
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:705 lxc/network.go:378
+#: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:840
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
 
-#: lxc/main.go:29
+#: lxc/main.go:32
 msgid "Connection refused; is LXD running?"
 msgstr ""
 
@@ -259,7 +244,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:246
+#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:244
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -269,75 +254,47 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:132
+#: lxc/image.go:134
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:25
-msgid ""
-"Copy containers within or in between LXD instances.\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
-"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-msgstr ""
-
-#: lxc/image.go:245
+#: lxc/image.go:247
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:232
+#: lxc/remote.go:246
 msgid "Could not create server cert dir"
 msgstr ""
 
-#: lxc/file.go:84
+#: lxc/file.go:91
 #, c-format
 msgid "Could not sanitize path %s"
 msgstr ""
 
-#: lxc/snapshot.go:21
-msgid ""
-"Create a read-only snapshot of a container.\n"
-"\n"
-"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Creates a snapshot of the container (optionally with the container's memory\n"
-"state). When --stateful is used, LXD attempts to checkpoint the container's\n"
-"running state, including process memory state, TCP connections, etc. so that "
-"it\n"
-"can be restored (via lxc restore) at a later time (although some things, e."
-"g.\n"
-"TCP connections after the TCP timeout window has expired, may not be "
-"restored\n"
-"successfully).\n"
-"\n"
-"Example:\n"
-"    lxc snapshot u1 snap0"
-msgstr ""
-
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:67 lxc/file.go:68
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:317 lxc/info.go:95
+#: lxc/image.go:319 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:184 lxc/launch.go:139
+#: lxc/init.go:182 lxc/launch.go:137
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:182
+#: lxc/init.go:180
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:610 lxc/image.go:651
+#: lxc/image.go:612 lxc/image.go:653
 msgid "DESCRIPTION"
 msgstr ""
 
-#: lxc/storage.go:570
+#: lxc/storage.go:608
 msgid "DRIVER"
 msgstr ""
 
@@ -345,45 +302,34 @@ msgstr ""
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
-#: lxc/delete.go:26
-msgid ""
-"Delete containers or snapshots.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Destroy containers or snapshots with any attached data (configuration, "
-"snapshots, ...)."
-msgstr ""
-
-#: lxc/config.go:652
+#: lxc/config.go:688
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config.go:839
+#: lxc/config.go:875
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
 
-#: lxc/info.go:143
+#: lxc/info.go:145
 #, fuzzy
 msgid "Disk usage:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/list.go:554
+#: lxc/list.go:578
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config.go:276
+#: lxc/config.go:312
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/main.go:41
+#: lxc/main.go:44
 msgid "Enable debug mode"
 msgstr ""
 
-#: lxc/main.go:40
+#: lxc/main.go:43
 msgid "Enable verbose mode"
 msgstr ""
 
@@ -391,11 +337,11 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/help.go:69
+#: lxc/help.go:77
 msgid "Environment:"
 msgstr ""
 
-#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:141 lxc/init.go:142
+#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:139 lxc/init.go:140
 msgid "Ephemeral container"
 msgstr ""
 
@@ -403,127 +349,102 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/exec.go:46
-msgid ""
-"Execute the specified command in a container.\n"
-"\n"
-"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
-"env KEY=VALUE...] [--] <command line>\n"
-"\n"
-"Mode defaults to non-interactive, interactive mode is selected if both stdin "
-"AND stdout are terminals (stderr is ignored)."
-msgstr ""
-
-#: lxc/image.go:321
+#: lxc/image.go:323
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:323
+#: lxc/image.go:325
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:273 lxc/image.go:608 lxc/image.go:650
+#: lxc/config.go:309 lxc/image.go:610 lxc/image.go:652
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/list.go:104
-msgid "Fast mode (same as --columns=nsacPt"
+#: lxc/manpage.go:62
+#, c-format
+msgid "Failed to generate 'lxc.%s.1': %v"
+msgstr ""
+
+#: lxc/manpage.go:55
+#, c-format
+msgid "Failed to generate 'lxc.1': %v"
+msgstr ""
+
+#: lxc/list.go:128
+msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:312
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
-#: lxc/action.go:45 lxc/action.go:46
+#: lxc/action.go:46 lxc/action.go:47
 msgid "Force the container to shutdown"
 msgstr ""
 
-#: lxc/delete.go:35 lxc/delete.go:36
+#: lxc/delete.go:33 lxc/delete.go:34
 msgid "Force the removal of stopped containers"
 msgstr ""
 
-#: lxc/main.go:42
+#: lxc/main.go:45
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:135 lxc/list.go:103
+#: lxc/image.go:137 lxc/list.go:127
 msgid "Format"
 msgstr ""
 
-#: lxc/remote.go:65
+#: lxc/remote.go:79
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/help.go:25
-msgid ""
-"Help page for the LXD client.\n"
-"\n"
-"lxc help [--all]"
-msgstr ""
-
-#: lxc/list.go:404
+#: lxc/list.go:428
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:405
+#: lxc/list.go:429
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config.go:275
+#: lxc/config.go:311
 msgid "ISSUE DATE"
 msgstr ""
 
-#: lxc/main.go:136
+#: lxc/main.go:139
 msgid "If this is your first time using LXD, you should also run: lxd init"
 msgstr ""
 
-#: lxc/main.go:43
+#: lxc/main.go:46
 msgid "Ignore aliases when determining what command to run"
 msgstr ""
 
-#: lxc/action.go:49
+#: lxc/action.go:50
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:248
+#: lxc/image.go:250
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:393 lxc/image.go:405
+#: lxc/image.go:395 lxc/image.go:407
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:390
+#: lxc/image.go:392
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
 
-#: lxc/init.go:75
-msgid ""
-"Initialize a container from a particular image.\n"
-"\n"
-"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
-"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--"
-"storage|-s <pool>]\n"
-"\n"
-"Initializes a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc init ubuntu:16.04 u1"
-msgstr ""
-
-#: lxc/remote.go:135
+#: lxc/remote.go:149
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config.go:254
+#: lxc/config.go:290
 msgid "Invalid certificate"
 msgstr ""
 
@@ -531,629 +452,165 @@ msgstr ""
 msgid "Invalid configuration key"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:359
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/file.go:286
+#: lxc/file.go:293
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:73
+#: lxc/file.go:80
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:126
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:133
+#: lxc/image.go:135
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:408
+#: lxc/list.go:432
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/main.go:27
+#: lxc/main.go:30
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:326
+#: lxc/image.go:328
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:328
+#: lxc/image.go:330
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid ""
-"Launch a container from a particular image.\n"
-"\n"
-"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
-"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
-"<network>] [--storage|-s <pool>]\n"
-"\n"
-"Launches a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc launch ubuntu:16.04 u1"
+#: lxc/info.go:241
+msgid "Log:"
 msgstr ""
 
-#: lxc/info.go:25
-msgid ""
-"List information on LXD servers and containers.\n"
-"\n"
-"For a container:\n"
-"    lxc info [<remote:>]<container> [--show-log]\n"
-"\n"
-"For a server:\n"
-"    lxc info [<remote:>]"
+#: lxc/network.go:460
+msgid "MANAGED"
 msgstr ""
 
-#: lxc/list.go:47
-msgid ""
-"Lists the containers.\n"
-"\n"
-"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
-"fast]\n"
-"\n"
-"The filters are:\n"
-"* A single keyword like \"web\" which will list any container with a name "
-"starting by \"web\".\n"
-"* A regular expression on the container name. (e.g. .*web.*01$)\n"
-"* A key/value pair referring to a configuration item. For those, the "
-"namespace can be abbreviated to the smallest unambiguous identifier:\n"
-" * \"user.blah=abc\" will list all containers with the \"blah\" user "
-"property set to \"abc\".\n"
-" * \"u.blah=abc\" will do the same\n"
-" * \"security.privileged=1\" will list all privileged containers\n"
-" * \"s.privileged=1\" will do the same\n"
-"* A regular expression matching a configuration item or its value. (e.g. "
-"volatile.eth0.hwaddr=00:16:3e:.*)\n"
-"\n"
-"The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table format.\n"
-"Column arguments are either pre-defined shorthand chars (see below),\n"
-"or (extended) config keys.  Commas between consecutive shorthand chars\n"
-"are optional.\n"
-"\n"
-"Pre-defined shorthand chars:\n"
-"* 4 - IPv4 address\n"
-"* 6 - IPv6 address\n"
-"* a - architecture\n"
-"* b - storage pool\n"
-"* c - creation date\n"
-"* l - last used date\n"
-"* n - name\n"
-"* p - pid of container init process\n"
-"* P - profiles\n"
-"* s - state\n"
-"* S - number of snapshots\n"
-"* t - type (persistent or ephemeral)\n"
-"\n"
-"Config key syntax: key[:name][:maxWidth]\n"
-"* key      - The (extended) config key to display\n"
-"* name     - Name to display in the column header, defaults to the key\n"
-"             if not specified or if empty (to allow defining maxWidth\n"
-"             without a custom name, e.g. user.key::0)\n"
-"* maxWidth - Max width of the column (longer results are truncated).\n"
-"             -1 == unlimited\n"
-"              0 == width of column header\n"
-"             >0 == max width in chars\n"
-"             Default is -1 (unlimited)\n"
-"\n"
-"Default column layout: ns46tS\n"
-"Fast column layout: nsacPt\n"
-"\n"
-"Example:\n"
-"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
-"hwaddr:MAC"
+#: lxc/image.go:133
+msgid "Make image public"
 msgstr ""
 
-#: lxc/info.go:239
-msgid "Log:"
+#: lxc/publish.go:34
+msgid "Make the image public"
 msgstr ""
 
-#: lxc/network.go:436
-msgid "MANAGED"
+#: lxc/info.go:163
+msgid "Memory (current)"
 msgstr ""
 
-#: lxc/image.go:131
-msgid "Make image public"
+#: lxc/info.go:167
+msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/publish.go:34
-msgid "Make the image public"
+#: lxc/info.go:179
+#, fuzzy
+msgid "Memory usage:"
+msgstr "  Χρήση μνήμης:"
+
+#: lxc/utils.go:173
+msgid "Missing summary."
 msgstr ""
 
-#: lxc/profile.go:49
-msgid ""
-"Manage configuration profiles.\n"
-"\n"
-"lxc profile list [<remote>:]                                    List "
-"available profiles.\n"
-"lxc profile show [<remote>:]<profile>                           Show details "
-"of a profile.\n"
-"lxc profile create [<remote>:]<profile>                         Create a "
-"profile.\n"
-"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>      Copy the "
-"profile.\n"
-"lxc profile get [<remote>:]<profile> <key>                      Get profile "
-"configuration.\n"
-"lxc profile set [<remote>:]<profile> <key> <value>              Set profile "
-"configuration.\n"
-"lxc profile unset [<remote>:]<profile> <key>                    Unset "
-"profile configuration.\n"
-"lxc profile delete [<remote>:]<profile>                         Delete a "
-"profile.\n"
-"lxc profile edit [<remote>:]<profile>\n"
-"    Edit profile, either by launching external editor or reading STDIN.\n"
-"    Example: lxc profile edit <profile> # launch editor\n"
-"             cat profile.yaml | lxc profile edit <profile> # read from "
-"profile.yaml\n"
-"\n"
-"lxc profile assign [<remote>:]<container> <profiles>\n"
-"    Assign a comma-separated list of profiles to a container, in order.\n"
-"    All profiles passed in this call (and only those) will be applied\n"
-"    to the specified container, i.e. it sets the list of profiles exactly "
-"to\n"
-"    those specified in this command. To add/remove a particular profile from "
-"a\n"
-"    container, use {add|remove} below.\n"
-"    Example: lxc profile assign foo default,bar # Apply default and bar\n"
-"             lxc profile assign foo default # Only default is active\n"
-"             lxc profile assign '' # no profiles are applied anymore\n"
-"             lxc profile assign bar,default # Apply default second now\n"
-"lxc profile add [<remote>:]<container> <profile> # add a profile to a "
-"container\n"
-"lxc profile remove [<remote>:]<container> <profile> # remove the profile "
-"from a container\n"
-"\n"
-"Devices:\n"
-"lxc profile device list [<remote>:]<profile>                                "
-"List devices in the given profile.\n"
-"lxc profile device show [<remote>:]<profile>                                "
-"Show full device details in the given profile.\n"
-"lxc profile device remove [<remote>:]<profile> <name>                       "
-"Remove a device from a profile.\n"
-"lxc profile device get [<remote>:]<profile> <name> <key>                    "
-"Get a device property.\n"
-"lxc profile device set [<remote>:]<profile> <name> <key> <value>            "
-"Set a device property.\n"
-"lxc profile device unset [<remote>:]<profile> <name> <key>                  "
-"Unset a device property.\n"
-"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
-"    Add a profile device, such as a disk or a nic, to the containers using "
-"the specified profile."
+#: lxc/network.go:248 lxc/network.go:297 lxc/storage.go:362 lxc/storage.go:462
+msgid "More than one device matches, specify the device name."
 msgstr ""
 
-#: lxc/config.go:58
-msgid ""
-"Manage configuration.\n"
-"\n"
-"lxc config device add [<remote>:]<container> <device> <type> "
-"[key=value...]   Add a device to a container.\n"
-"lxc config device get [<remote>:]<container> <device> "
-"<key>                   Get a device property.\n"
-"lxc config device set [<remote>:]<container> <device> <key> "
-"<value>           Set a device property.\n"
-"lxc config device unset [<remote>:]<container> <device> "
-"<key>                 Unset a device property.\n"
-"lxc config device list "
-"[<remote>:]<container>                                 List devices for "
-"container.\n"
-"lxc config device show "
-"[<remote>:]<container>                                 Show full device "
-"details for container.\n"
-"lxc config device remove [<remote>:]<container> "
-"<name>                        Remove device from container.\n"
-"\n"
-"lxc config get [<remote>:][container] "
-"<key>                                   Get container or server "
-"configuration key.\n"
-"lxc config set [<remote>:][container] <key> "
-"<value>                           Set container or server configuration "
-"key.\n"
-"lxc config unset [<remote>:][container] "
-"<key>                                 Unset container or server "
-"configuration key.\n"
-"lxc config show [<remote>:][container] [--"
-"expanded]                           Show container or server configuration.\n"
-"lxc config edit [<remote>:]"
-"[container]                                        Edit container or server "
-"configuration in external editor.\n"
-"    Edit configuration, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc config edit <container> # launch editor\n"
-"             cat config.yaml | lxc config edit <container> # read from "
-"config.yaml\n"
-"\n"
-"lxc config trust list "
-"[<remote>:]                                             List all trusted "
-"certs.\n"
-"lxc config trust add [<remote>:] <certfile."
-"crt>                               Add certfile.crt to trusted hosts.\n"
-"lxc config trust remove [<remote>:] [hostname|"
-"fingerprint]                    Remove the cert from trusted hosts.\n"
-"\n"
-"Examples:\n"
-"To mount host's /share/c1 onto /opt in the container:\n"
-"    lxc config device add [<remote>:]container1 <device-name> disk source=/"
-"share/c1 path=opt\n"
-"\n"
-"To set an lxc config value:\n"
-"    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = "
-"1'\n"
-"\n"
-"To listen on IPv4 and IPv6 port 8443 (you can omit the 8443 its the "
-"default):\n"
-"    lxc config set core.https_address [::]:8443\n"
-"\n"
-"To set the server trust password:\n"
-"    lxc config set core.trust_password blah"
+#: lxc/file.go:281
+msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/file.go:36
-msgid ""
-"Manage files in a container.\n"
-"\n"
-"lxc file pull [-r|--recursive] [<remote>:]<container> "
-"[[<remote>:]<container>...] <target path>\n"
-"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
-"mode=MODE] <source path> [<source path>...] [<remote>:]<container>\n"
-"lxc file delete [<remote>:]<container> [[<remote>:]<container>...]\n"
-"lxc file edit [<remote>:]<container>/<path>\n"
-"\n"
-"<source> in the case of pull, <target> in the case of push and <file> in the "
-"case of edit are <container name>/<path>\n"
-"\n"
-"Examples:\n"
-"To push /etc/hosts into the container foo:\n"
-"    lxc file push /etc/hosts foo/etc/hosts\n"
-"\n"
-"To pull /etc/hosts from the container:\n"
-"    lxc file pull foo/etc/hosts ."
+#: lxc/action.go:68
+msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/network.go:49
-msgid ""
-"Manage networks.\n"
-"\n"
-"lxc network list [<remote>:]                              List available "
-"networks.\n"
-"lxc network show [<remote>:]<network>                     Show details of a "
-"network.\n"
-"lxc network create [<remote>:]<network> [key=value...]    Create a network.\n"
-"lxc network get [<remote>:]<network> <key>                Get network "
-"configuration.\n"
-"lxc network set [<remote>:]<network> <key> <value>        Set network "
-"configuration.\n"
-"lxc network unset [<remote>:]<network> <key>              Unset network "
-"configuration.\n"
-"lxc network delete [<remote>:]<network>                   Delete a network.\n"
-"lxc network edit [<remote>:]<network>\n"
-"    Edit network, either by launching external editor or reading STDIN.\n"
-"    Example: lxc network edit <network> # launch editor\n"
-"             cat network.yaml | lxc network edit <network> # read from "
-"network.yaml\n"
-"\n"
-"lxc network attach [<remote>:]<network> <container> [device name] [interface "
-"name]\n"
-"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
-"[interface name]\n"
-"\n"
-"lxc network detach [<remote>:]<network> <container> [device name]\n"
-"lxc network detach-profile [<remote>:]<network> <container> [device name]"
+#: lxc/list.go:433 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:394
+#: lxc/storage.go:607 lxc/storage.go:687
+msgid "NAME"
 msgstr ""
 
-#: lxc/remote.go:37
-msgid ""
-"Manage remote LXD servers.\n"
-"\n"
-"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
-"password=PASSWORD]\n"
-"                                        [--public] [--protocol=PROTOCOL]    "
-"Add the remote <remote> at <url>.\n"
-"lxc remote remove <remote>                                                  "
-"Remove the remote <remote>.\n"
-"lxc remote list                                                             "
-"List all remotes.\n"
-"lxc remote rename <old name> <new name>                                     "
-"Rename remote <old name> to <new name>.\n"
-"lxc remote set-url <remote> <url>                                           "
-"Update <remote>'s url to <url>.\n"
-"lxc remote set-default <remote>                                             "
-"Set the default remote.\n"
-"lxc remote get-default                                                      "
-"Print the default remote."
+#: lxc/network.go:444 lxc/remote.go:368 lxc/remote.go:373
+msgid "NO"
 msgstr ""
 
-#: lxc/storage.go:61
-msgid ""
-"Manage storage.\n"
-"\n"
-"lxc storage list [<remote>:]                                    List "
-"available storage pools.\n"
-"lxc storage show [<remote>:]<pool>                              Show details "
-"of a storage pool.\n"
-"lxc storage create [<remote>:]<pool> <driver> [key=value]...    Create a "
-"storage pool.\n"
-"lxc storage get [<remote>:]<pool> <key>                         Get storage "
-"pool configuration.\n"
-"lxc storage set [<remote>:]<pool> <key> <value>                 Set storage "
-"pool configuration.\n"
-"lxc storage unset [<remote>:]<pool> <key>                       Unset "
-"storage pool configuration.\n"
-"lxc storage delete [<remote>:]<pool>                            Delete a "
-"storage pool.\n"
-"lxc storage edit [<remote>:]<pool>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage edit [<remote>:]<pool> # launch editor\n"
-"             cat pool.yaml | lxc storage edit [<remote>:]<pool> # read from "
-"pool.yaml\n"
-"\n"
-"lxc storage volume list [<remote>:]<pool>                              List "
-"available storage volumes on a storage pool.\n"
-"lxc storage volume show [<remote>:]<pool> <volume>                     Show "
-"details of a storage volume on a storage pool.\n"
-"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...    "
-"Create a storage volume on a storage pool.\n"
-"lxc storage volume get [<remote>:]<pool> <volume> <key>                Get "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>        Set "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume unset [<remote>:]<pool> <volume> <key>              Unset "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume delete [<remote>:]<pool> <volume>                   "
-"Delete a storage volume on a storage pool.\n"
-"lxc storage volume edit [<remote>:]<pool> <volume>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage volume edit [<remote>:]<pool> <volume> # launch "
-"editor\n"
-"             cat pool.yaml | lxc storage volume edit [<remote>:]<pool> "
-"<volume> # read from pool.yaml\n"
-"\n"
-"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
-"name] <path>\n"
-"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name] <path>\n"
-"\n"
-"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
-"name]\n"
-"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name]\n"
-"\n"
-"\n"
-"Unless specified through a prefix, all volume operations affect \"custom"
-"\" (user created) volumes.\n"
-"\n"
-"Examples:\n"
-"To show the properties of a custom volume called \"data\" in the \"default\" "
-"pool:\n"
-"    lxc storage volume show default data\n"
-"\n"
-"To show the properties of the filesystem for a container called \"data\" in "
-"the \"default\" pool:\n"
-"    lxc storage volume show default container/data\n"
+#: lxc/info.go:91
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: lxc/image.go:62
-msgid ""
-"Manipulate container images.\n"
-"\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
-"server.\n"
-"\n"
-"When using remote images, LXD will automatically cache images for you\n"
-"and remove them upon expiration.\n"
-"\n"
-"The image unique identifier is the hash (sha-256) of its representation\n"
-"as a compressed tarball (or for split images, the concatenation of the\n"
-"metadata and rootfs tarballs).\n"
-"\n"
-"Images can be referenced by their full hash, shortest unique partial\n"
-"hash or alias name (if one is set).\n"
-"\n"
-"\n"
-"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
-"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
-"[--alias=ALIAS...] [prop=value]\n"
-"    Import an image tarball (or tarballs) into the LXD image store.\n"
-"\n"
-"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-"
-"aliases] [--public] [--auto-update]\n"
-"    Copy an image from one LXD daemon to another over the network.\n"
-"\n"
-"    The auto-update flag instructs the server to keep this image up to\n"
-"    date. It requires the source to be an alias and for it to be public.\n"
-"\n"
-"lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
-"    Delete one or more images from the LXD image store.\n"
-"\n"
-"lxc image export [<remote>:]<image> [target]\n"
-"    Export an image from the LXD image store into a distributable tarball.\n"
-"\n"
-"    The output target is optional and defaults to the working directory.\n"
-"    The target may be an existing directory, file name, or \"-\" to specify\n"
-"    stdout.  The target MUST be a directory when exporting a split image.\n"
-"    If the target is a directory, the image's name (each part's name for\n"
-"    split images) as found in the database will be used for the exported\n"
-"    image.  If the target is a file (not a directory and not stdout), then\n"
-"    the appropriate extension will be appended to the provided file name\n"
-"    based on the algorithm used to compress the image. \n"
-"\n"
-"lxc image info [<remote>:]<image>\n"
-"    Print everything LXD knows about a given image.\n"
-"\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
-"    List images in the LXD image store. Filters may be of the\n"
-"    <key>=<value> form for property based filtering, or part of the image\n"
-"    hash or part of the image alias name.\n"
-"\n"
-"lxc image show [<remote>:]<image>\n"
-"    Yaml output of the user modifiable properties of an image.\n"
-"\n"
-"lxc image edit [<remote>:]<image>\n"
-"    Edit image, either by launching external editor or reading STDIN.\n"
-"    Example: lxc image edit <image> # launch editor\n"
-"             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
-"\n"
-"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
-"    Create a new alias for an existing image.\n"
-"\n"
-"lxc image alias delete [<remote>:]<alias>\n"
-"    Delete an alias.\n"
-"\n"
-"lxc image alias list [<remote>:] [filter]\n"
-"    List the aliases. Filters may be part of the image hash or part of the "
-"image alias name."
-msgstr ""
-
-#: lxc/info.go:161
-msgid "Memory (current)"
-msgstr ""
-
-#: lxc/info.go:165
-msgid "Memory (peak)"
-msgstr ""
-
-#: lxc/info.go:177
-#, fuzzy
-msgid "Memory usage:"
-msgstr "  Χρήση μνήμης:"
-
-#: lxc/help.go:87
-msgid "Missing summary."
-msgstr ""
-
-#: lxc/monitor.go:41
-msgid ""
-"Monitor activity on the LXD server.\n"
-"\n"
-"lxc monitor [<remote>:] [--type=TYPE...]\n"
-"\n"
-"Connects to the monitoring interface of the specified LXD server.\n"
-"\n"
-"By default will listen to all message types.\n"
-"Specific types to listen to can be specified with --type.\n"
-"\n"
-"Example:\n"
-"    lxc monitor --type=logging"
-msgstr ""
-
-#: lxc/network.go:224 lxc/network.go:273 lxc/storage.go:324 lxc/storage.go:424
-msgid "More than one device matches, specify the device name."
-msgstr ""
-
-#: lxc/file.go:274
-msgid "More than one file to download, but target is not a directory"
-msgstr ""
-
-#: lxc/move.go:16
-msgid ""
-"Move containers within or in between lxd instances.\n"
-"\n"
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
-"    Move a container between two hosts, renaming it if destination name "
-"differs.\n"
-"\n"
-"lxc move <old name> <new name>\n"
-"    Rename a local container.\n"
-"\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
-"    Rename a snapshot."
-msgstr ""
-
-#: lxc/action.go:67
-msgid "Must supply container name for: "
-msgstr ""
-
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
-#: lxc/storage.go:569 lxc/storage.go:649
-msgid "NAME"
-msgstr ""
-
-#: lxc/network.go:420 lxc/remote.go:354 lxc/remote.go:359
-msgid "NO"
-msgstr ""
-
-#: lxc/info.go:89
-#, c-format
-msgid "Name: %s"
-msgstr ""
-
-#: lxc/network.go:198
+#: lxc/network.go:222
 #, c-format
 msgid "Network %s created"
 msgstr ""
 
-#: lxc/network.go:301
+#: lxc/network.go:325
 #, c-format
 msgid "Network %s deleted"
 msgstr ""
 
-#: lxc/init.go:143 lxc/init.go:144
+#: lxc/init.go:141 lxc/init.go:142
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:196
 #, fuzzy
 msgid "Network usage:"
 msgstr "  Χρήση δικτύου:"
 
-#: lxc/image.go:134 lxc/publish.go:35
+#: lxc/image.go:136 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/config.go:285
+#: lxc/config.go:321
 msgid "No certificate provided to add"
 msgstr ""
 
-#: lxc/network.go:233 lxc/network.go:282
+#: lxc/network.go:257 lxc/network.go:306
 msgid "No device found for this network"
 msgstr ""
 
-#: lxc/storage.go:333 lxc/storage.go:433
+#: lxc/storage.go:371 lxc/storage.go:471
 msgid "No device found for this storage volume."
 msgstr ""
 
-#: lxc/config.go:308
+#: lxc/config.go:344
 msgid "No fingerprint specified."
 msgstr ""
 
-#: lxc/storage.go:285 lxc/storage.go:369
+#: lxc/storage.go:323 lxc/storage.go:407
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:120
+#: lxc/remote.go:134
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:396
+#: lxc/image.go:398
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
-#: lxc/network.go:330 lxc/network.go:457
+#: lxc/network.go:354 lxc/network.go:481
 msgid "Only managed networks can be modified."
 msgstr ""
 
-#: lxc/help.go:63 lxc/main.go:112
+#: lxc/help.go:71 lxc/main.go:112 lxc/main.go:163
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:507
+#: lxc/image.go:509
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -1162,247 +619,219 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:556
+#: lxc/list.go:580
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:410
+#: lxc/list.go:434
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:411
+#: lxc/list.go:435
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:382
+#: lxc/remote.go:396
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:609 lxc/remote.go:383
+#: lxc/image.go:611 lxc/remote.go:397
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:188
+#: lxc/info.go:190
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:189
+#: lxc/info.go:191
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/help.go:70
+#: lxc/help.go:78
 msgid "Path to an alternate client configuration directory"
 msgstr ""
 
-#: lxc/help.go:71
+#: lxc/help.go:79
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:31
+#: lxc/main.go:202
+msgid "Pause containers."
+msgstr ""
+
+#: lxc/main.go:34
 msgid "Permission denied, are you in the lxd group?"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:108
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/network.go:355 lxc/profile.go:219 lxc/storage.go:498 lxc/storage.go:803
+#: lxc/network.go:379 lxc/profile.go:258 lxc/storage.go:536 lxc/storage.go:841
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:536 lxc/config.go:601 lxc/image.go:704
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:706
 msgid "Press enter to start the editor again"
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "Print all the subcommands help."
-msgstr ""
-
-#: lxc/help.go:65
+#: lxc/help.go:73
 msgid "Print debug information"
 msgstr ""
 
-#: lxc/help.go:64
+#: lxc/help.go:72
 msgid "Print less common commands"
 msgstr ""
 
-#: lxc/help.go:66
+#: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
 
-#: lxc/version.go:18
-msgid ""
-"Prints the version number of this client tool.\n"
-"\n"
-"lxc version"
-msgstr ""
-
-#: lxc/info.go:130
+#: lxc/info.go:132
 #, c-format
 msgid "Processes: %d"
 msgstr ""
 
-#: lxc/profile.go:275
+#: lxc/profile.go:314
 #, c-format
 msgid "Profile %s added to %s"
 msgstr ""
 
-#: lxc/profile.go:170
+#: lxc/profile.go:209
 #, c-format
 msgid "Profile %s created"
 msgstr ""
 
-#: lxc/profile.go:240
+#: lxc/profile.go:279
 #, c-format
 msgid "Profile %s deleted"
 msgstr ""
 
-#: lxc/profile.go:306
+#: lxc/profile.go:345
 #, c-format
 msgid "Profile %s removed from %s"
 msgstr ""
 
-#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:139 lxc/init.go:140
+#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:137 lxc/init.go:138
 msgid "Profile to apply to the new container"
 msgstr ""
 
-#: lxc/profile.go:256
+#: lxc/profile.go:295
 #, c-format
 msgid "Profiles %s applied to %s"
 msgstr ""
 
-#: lxc/info.go:104
+#: lxc/info.go:106
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:330
+#: lxc/image.go:332
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:54
+#: lxc/remote.go:68
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:313
+#: lxc/image.go:315
 #, c-format
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:27
-msgid ""
-"Publish containers as images.\n"
-"\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
-msgstr ""
-
-#: lxc/file.go:58 lxc/file.go:59
+#: lxc/file.go:65 lxc/file.go:66
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/remote.go:52
+#: lxc/remote.go:66
 msgid "Remote admin password"
 msgstr ""
 
-#: lxc/info.go:91
+#: lxc/info.go:93
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/delete.go:43
+#: lxc/delete.go:41
 #, c-format
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/delete.go:37 lxc/delete.go:38
+#: lxc/delete.go:35 lxc/delete.go:36
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:129
 msgid "Resources:"
 msgstr ""
 
-#: lxc/restore.go:21
-msgid ""
-"Restore a container's state to a previous snapshot.\n"
-"\n"
-"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
-"\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
-"\n"
-"Examples:\n"
-"Create the snapshot:\n"
-"    lxc snapshot u1 snap0\n"
-"\n"
-"Restore the snapshot:\n"
-"    lxc restore u1 snap0"
+#: lxc/main.go:210
+msgid "Restart containers."
 msgstr ""
 
-#: lxc/init.go:256
+#: lxc/init.go:254
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:612
+#: lxc/image.go:614
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:412
+#: lxc/list.go:436
 msgid "SNAPSHOTS"
 msgstr ""
 
-#: lxc/storage.go:571
+#: lxc/storage.go:609
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:413
+#: lxc/list.go:437
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:384
+#: lxc/remote.go:398
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:415
+#: lxc/list.go:439
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:225
+#: lxc/remote.go:239
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:287
+#: lxc/remote.go:301
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:53
+#: lxc/remote.go:67
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
-#: lxc/file.go:56
+#: lxc/file.go:63
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:57
+#: lxc/file.go:64
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:55
+#: lxc/file.go:62
 msgid "Set the file's uid on push"
 msgstr ""
 
-#: lxc/help.go:32
+#: lxc/help.go:29
 msgid "Show all commands (not just interesting ones)"
 msgstr ""
 
-#: lxc/help.go:67
+#: lxc/help.go:75
 msgid "Show client version"
 msgstr ""
 
-#: lxc/info.go:36
+#: lxc/info.go:38
 msgid "Show the container's last 100 log lines?"
 msgstr ""
 
@@ -1410,83 +839,91 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:311
+#: lxc/image.go:313
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:208
+#: lxc/info.go:210
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/action.go:133
+#: lxc/action.go:134
 #, c-format
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:340
+#: lxc/image.go:342
 msgid "Source:"
 msgstr ""
 
-#: lxc/launch.go:148
+#: lxc/main.go:220
+msgid "Start containers."
+msgstr ""
+
+#: lxc/launch.go:146
 #, c-format
 msgid "Starting %s"
 msgstr ""
 
-#: lxc/info.go:98
+#: lxc/info.go:100
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
+#: lxc/main.go:226
+msgid "Stop containers."
+msgstr ""
+
 #: lxc/publish.go:36 lxc/publish.go:37
 msgid "Stop the container if currently running"
 msgstr ""
 
-#: lxc/delete.go:107 lxc/publish.go:114
+#: lxc/delete.go:105 lxc/publish.go:114
 msgid "Stopping container failed!"
 msgstr ""
 
-#: lxc/storage.go:398
+#: lxc/storage.go:436
 #, c-format
 msgid "Storage pool %s created"
 msgstr ""
 
-#: lxc/storage.go:448
+#: lxc/storage.go:486
 #, c-format
 msgid "Storage pool %s deleted"
 msgstr ""
 
-#: lxc/init.go:145 lxc/init.go:146
+#: lxc/init.go:143 lxc/init.go:144
 msgid "Storage pool name"
 msgstr ""
 
-#: lxc/storage.go:672
+#: lxc/storage.go:710
 #, c-format
 msgid "Storage volume %s created"
 msgstr ""
 
-#: lxc/storage.go:682
+#: lxc/storage.go:720
 #, c-format
 msgid "Storage volume %s deleted"
 msgstr ""
 
-#: lxc/action.go:48
+#: lxc/action.go:49
 msgid "Store the container state (only for stop)"
 msgstr ""
 
-#: lxc/info.go:169
+#: lxc/info.go:171
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:173
+#: lxc/info.go:175
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:414 lxc/network.go:435 lxc/storage.go:648
+#: lxc/list.go:438 lxc/network.go:459 lxc/storage.go:686
 msgid "TYPE"
 msgstr ""
 
-#: lxc/delete.go:93
+#: lxc/delete.go:91
 msgid "The container is currently running, stop it first or pass --force."
 msgstr ""
 
@@ -1496,29 +933,29 @@ msgid ""
 "restarted."
 msgstr ""
 
-#: lxc/init.go:329
+#: lxc/init.go:327
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
-#: lxc/config.go:680 lxc/config.go:692 lxc/config.go:725 lxc/config.go:743
-#: lxc/config.go:781 lxc/config.go:799
+#: lxc/config.go:716 lxc/config.go:728 lxc/config.go:761 lxc/config.go:779
+#: lxc/config.go:817 lxc/config.go:835
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:313
+#: lxc/init.go:311
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/main.go:181
-msgid "The opposite of `lxc pause` is `lxc start`."
+#: lxc/action.go:34
+msgid "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/network.go:238 lxc/network.go:287 lxc/storage.go:338 lxc/storage.go:438
+#: lxc/network.go:262 lxc/network.go:311 lxc/storage.go:376 lxc/storage.go:476
 msgid "The specified device doesn't exist"
 msgstr ""
 
-#: lxc/network.go:242 lxc/network.go:291
+#: lxc/network.go:266 lxc/network.go:315
 msgid "The specified device doesn't match the network"
 msgstr ""
 
@@ -1526,201 +963,910 @@ msgstr ""
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
-#: lxc/action.go:44
+#: lxc/help.go:47
+msgid ""
+"This is the LXD command line client.\n"
+"\n"
+"All of LXD's features can be driven through the various commands below.\n"
+"For help with any of those, simply call them with --help."
+msgstr ""
+
+#: lxc/action.go:45
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:316
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:331
+#: lxc/init.go:329
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:330
+#: lxc/init.go:328
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
-#: lxc/main.go:137
+#: lxc/main.go:140
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:398
+#: lxc/image.go:400
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/action.go:97 lxc/launch.go:161
+#: lxc/action.go:98 lxc/launch.go:159
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:100
+#: lxc/info.go:102
 msgid "Type: ephemeral"
 msgstr ""
 
-#: lxc/info.go:102
+#: lxc/info.go:104
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:613
+#: lxc/image.go:615
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:381
+#: lxc/remote.go:395
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:461 lxc/profile.go:500 lxc/storage.go:610 lxc/storage.go:688
 msgid "USED BY"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/manpage.go:36
+msgid "Unable to find help2man."
+msgstr ""
+
+#: lxc/remote.go:109
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:319
+#: lxc/image.go:321
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/main.go:112
+#: lxc/action.go:37
 #, c-format
-msgid "Usage: %s"
+msgid ""
+"Usage: lxc %s [<remote>:]<container> [[<remote>:]<container>...]\n"
+"\n"
+"%s%s"
 msgstr ""
 
-#: lxc/help.go:48
+#: lxc/help.go:45
 msgid "Usage: lxc <command> [options]"
 msgstr ""
 
-#: lxc/delete.go:47
-msgid "User aborted delete operation."
-msgstr ""
-
-#: lxc/restore.go:38
+#: lxc/config.go:58
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
-"available)"
-msgstr ""
-
-#: lxc/snapshot.go:38
-msgid "Whether or not to snapshot the container's running state"
-msgstr ""
-
-#: lxc/network.go:422 lxc/remote.go:356 lxc/remote.go:361
-msgid "YES"
-msgstr ""
-
-#: lxc/main.go:52
-msgid "`lxc config profile` is deprecated, please use `lxc profile`"
-msgstr ""
-
-#: lxc/launch.go:132
-msgid "bad number of things scanned from image, container or snapshot"
-msgstr ""
-
-#: lxc/action.go:93
-msgid "bad result type from action"
-msgstr ""
-
-#: lxc/copy.go:116
-msgid "can't copy to the same container name"
-msgstr ""
-
-#: lxc/file.go:309
-msgid "can't pull a directory without --recursive"
-msgstr ""
-
-#: lxc/remote.go:344
-msgid "can't remove the default remote"
-msgstr ""
-
-#: lxc/file.go:120
-msgid "can't supply uid/gid/mode in recursive mode"
-msgstr ""
-
-#: lxc/remote.go:370
-msgid "default"
-msgstr ""
-
-#: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
-#: lxc/init.go:236 lxc/init.go:241 lxc/launch.go:116 lxc/launch.go:121
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
-#: lxc/image.go:305
-msgid "disabled"
-msgstr ""
-
-#: lxc/image.go:307
-msgid "enabled"
-msgstr ""
-
-#: lxc/action.go:125 lxc/main.go:22 lxc/main.go:148
-#, c-format
-msgid "error: %v"
-msgstr ""
-
-#: lxc/help.go:40 lxc/main.go:107
-#, c-format
-msgid "error: unknown command: %s"
+"Usage: lxc config <subcommand> [options]\n"
+"\n"
+"Change container or server configuration options.\n"
+"\n"
+"*Container configuration*\n"
+"\n"
+"lxc config get [<remote>:][container] <key>\n"
+"    Get container or server configuration key.\n"
+"\n"
+"lxc config set [<remote>:][container] <key> <value>\n"
+"    Set container or server configuration key.\n"
+"\n"
+"lxc config unset [<remote>:][container] <key>\n"
+"    Unset container or server configuration key.\n"
+"\n"
+"lxc config show [<remote>:][container] [--expanded]\n"
+"    Show container or server configuration.\n"
+"\n"
+"lxc config edit [<remote>:][container]\n"
+"    Edit configuration, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Device management*\n"
+"\n"
+"lxc config device add [<remote>:]<container> <device> <type> [key=value...]\n"
+"    Add a device to a container.\n"
+"\n"
+"lxc config device get [<remote>:]<container> <device> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc config device set [<remote>:]<container> <device> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc config device unset [<remote>:]<container> <device> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc config device list [<remote>:]<container>\n"
+"    List devices for container.\n"
+"\n"
+"lxc config device show [<remote>:]<container>\n"
+"    Show full device details for container.\n"
+"\n"
+"lxc config device remove [<remote>:]<container> <name>\n"
+"    Remove device from container.\n"
+"\n"
+"*Client trust store management*\n"
+"\n"
+"lxc config trust list [<remote>:]\n"
+"    List all trusted certs.\n"
+"\n"
+"lxc config trust add [<remote>:] <certfile.crt>\n"
+"    Add certfile.crt to trusted hosts.\n"
+"\n"
+"lxc config trust remove [<remote>:] [hostname|fingerprint]\n"
+"    Remove the cert from trusted hosts.\n"
+"\n"
+"*Examples*\n"
+"\n"
+"cat config.yaml | lxc config edit <container>\n"
+"    Update the container configuration from config.yaml.\n"
+"\n"
+"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the container.\n"
+"\n"
+"lxc config set [<remote>:]<container> limits.cpu 2\n"
+"    Will set a CPU limit of \"2\" for the container.\n"
+"\n"
+"lxc config set core.https_address [::]:8443\n"
+"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"\n"
+"lxc config set core.trust_password blah\n"
+"    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/launch.go:136
-msgid "got bad version"
+#: lxc/copy.go:25
+msgid ""
+"Usage: lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] "
+"[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]\n"
+"\n"
+"Copy containers within or in between LXD instances."
 msgstr ""
 
-#: lxc/image.go:300 lxc/image.go:589
-msgid "no"
+#: lxc/delete.go:26
+msgid ""
+"Usage: lxc delete [<remote>:]<container>[/<snapshot>] "
+"[[<remote>:]<container>[/<snapshot>]...]\n"
+"\n"
+"Delete containers and snapshots."
 msgstr ""
 
-#: lxc/copy.go:165
-msgid "not all the profiles from the source exist on the target"
+#: lxc/exec.go:46
+msgid ""
+"Usage: lxc exec [<remote>:]<container> [--mode=auto|interactive|non-"
+"interactive] [--env KEY=VALUE...] [--] <command line>\n"
+"\n"
+"Execute commands in containers.\n"
+"\n"
+"Mode defaults to non-interactive, interactive mode is selected if both stdin "
+"AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/remote.go:218
-msgid "ok (y/n)?"
+#: lxc/file.go:36
+msgid ""
+"Usage: lxc file <subcommand> [options]\n"
+"\n"
+"Manage files in containers.\n"
+"\n"
+"lxc file pull [-r|--recursive] [<remote>:]<container>/<path> "
+"[[<remote>:]<container>/<path>...] <target path>\n"
+"    Pull files from containers.\n"
+"\n"
+"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
+"mode=MODE] <source path> [<source path>...] [<remote>:]<container>/<path>\n"
+"    Push files into containers.\n"
+"\n"
+"lxc file delete [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"<path>...]\n"
+"    Delete files in containers.\n"
+"\n"
+"lxc file edit [<remote>:]<container>/<path>\n"
+"    Edit files in containers using the default text editor.\n"
+"\n"
+"*Examples*\n"
+"lxc file push /etc/hosts foo/etc/hosts\n"
+"   To push /etc/hosts into the container \"foo\".\n"
+"\n"
+"lxc file pull foo/etc/hosts .\n"
+"   To pull /etc/hosts from the container and write it to the current "
+"directory."
 msgstr ""
 
-#: lxc/main.go:305 lxc/main.go:309
-#, c-format
-msgid "processing aliases failed %s\n"
+#: lxc/finger.go:15
+msgid ""
+"Usage: lxc finger [<remote>:]\n"
+"\n"
+"Check if the LXD server is alive."
 msgstr ""
 
-#: lxc/file.go:376
-msgid "recursive edit doesn't make sense :("
+#: lxc/help.go:22
+msgid ""
+"Usage: lxc help [--all]\n"
+"\n"
+"Help page for the LXD client."
 msgstr ""
 
-#: lxc/remote.go:406
-#, c-format
-msgid "remote %s already exists"
+#: lxc/image.go:62
+msgid ""
+"Usage: lxc image <subcommand> [options]\n"
+"\n"
+"Manipulate container images.\n"
+"\n"
+"In LXD containers are created from images. Those images were themselves\n"
+"either generated from an existing container or downloaded from an image\n"
+"server.\n"
+"\n"
+"When using remote images, LXD will automatically cache images for you\n"
+"and remove them upon expiration.\n"
+"\n"
+"The image unique identifier is the hash (sha-256) of its representation\n"
+"as a compressed tarball (or for split images, the concatenation of the\n"
+"metadata and rootfs tarballs).\n"
+"\n"
+"Images can be referenced by their full hash, shortest unique partial\n"
+"hash or alias name (if one is set).\n"
+"\n"
+"\n"
+"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
+"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
+"[--alias=ALIAS...] [prop=value]\n"
+"    Import an image tarball (or tarballs) into the LXD image store.\n"
+"\n"
+"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-"
+"aliases] [--public] [--auto-update]\n"
+"    Copy an image from one LXD daemon to another over the network.\n"
+"\n"
+"    The auto-update flag instructs the server to keep this image up to\n"
+"    date. It requires the source to be an alias and for it to be public.\n"
+"\n"
+"lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
+"    Delete one or more images from the LXD image store.\n"
+"\n"
+"lxc image export [<remote>:]<image> [target]\n"
+"    Export an image from the LXD image store into a distributable tarball.\n"
+"\n"
+"    The output target is optional and defaults to the working directory.\n"
+"    The target may be an existing directory, file name, or \"-\" to specify\n"
+"    stdout.  The target MUST be a directory when exporting a split image.\n"
+"    If the target is a directory, the image's name (each part's name for\n"
+"    split images) as found in the database will be used for the exported\n"
+"    image.  If the target is a file (not a directory and not stdout), then\n"
+"    the appropriate extension will be appended to the provided file name\n"
+"    based on the algorithm used to compress the image. \n"
+"\n"
+"lxc image info [<remote>:]<image>\n"
+"    Print everything LXD knows about a given image.\n"
+"\n"
+"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"    List images in the LXD image store. Filters may be of the\n"
+"    <key>=<value> form for property based filtering, or part of the image\n"
+"    hash or part of the image alias name.\n"
+"\n"
+"lxc image show [<remote>:]<image>\n"
+"    Yaml output of the user modifiable properties of an image.\n"
+"\n"
+"lxc image edit [<remote>:]<image>\n"
+"    Edit image, either by launching external editor or reading STDIN.\n"
+"    Example: lxc image edit <image> # launch editor\n"
+"             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
+"\n"
+"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
+"    Create a new alias for an existing image.\n"
+"\n"
+"lxc image alias delete [<remote>:]<alias>\n"
+"    Delete an alias.\n"
+"\n"
+"lxc image alias list [<remote>:] [filter]\n"
+"    List the aliases. Filters may be part of the image hash or part of the "
+"image alias name."
+msgstr ""
+
+#: lxc/info.go:25
+msgid ""
+"Usage: lxc info [<remote>:][<container>] [--show-log]\n"
+"\n"
+"Show container or server information.\n"
+"\n"
+"lxc info [<remote>:]<container> [--show-log]\n"
+"    For container information.\n"
+"\n"
+"lxc info [<remote>:]\n"
+"    For LXD server information."
+msgstr ""
+
+#: lxc/init.go:75
+msgid ""
+"Usage: lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc init ubuntu:16.04 u1"
+msgstr ""
+
+#: lxc/launch.go:23
+msgid ""
+"Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create and start containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc launch ubuntu:16.04 u1"
+msgstr ""
+
+#: lxc/list.go:47
+msgid ""
+"Usage: lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] "
+"[--fast]\n"
+"\n"
+"List the existing containers.\n"
+"\n"
+"Default column layout: ns46tS\n"
+"Fast column layout: nsacPt\n"
+"\n"
+"*Filters*\n"
+"A single keyword like \"web\" which will list any container with a name "
+"starting by \"web\".\n"
+"\n"
+"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"\n"
+"A key/value pair referring to a configuration item. For those, the namespace "
+"can be abbreviated to the smallest unambiguous identifier.\n"
+"    - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"property set to \"abc\".\n"
+"\n"
+"    - \"u.blah=abc\" will do the same\n"
+"\n"
+"    - \"security.privileged=1\" will list all privileged containers\n"
+"\n"
+"    - \"s.privileged=1\" will do the same\n"
+"\n"
+"A regular expression matching a configuration item or its value. (e.g. "
+"volatile.eth0.hwaddr=00:16:3e:.*).\n"
+"\n"
+"*Columns*\n"
+"The -c option takes a comma separated list of arguments that control\n"
+"which container attributes to output when displaying in table format.\n"
+"\n"
+"Column arguments are either pre-defined shorthand chars (see below),\n"
+"or (extended) config keys.\n"
+"\n"
+"Commas between consecutive shorthand chars are optional.\n"
+"\n"
+"Pre-defined column shorthand chars:\n"
+"\n"
+"    4 - IPv4 address\n"
+"\n"
+"    6 - IPv6 address\n"
+"\n"
+"    a - Architecture\n"
+"\n"
+"    b - Storage pool\n"
+"\n"
+"    c - Creation date\n"
+"\n"
+"    l - Last used date\n"
+"\n"
+"    n - Name\n"
+"\n"
+"    p - PID of the container's init process\n"
+"\n"
+"    P - Profiles\n"
+"\n"
+"    s - State\n"
+"\n"
+"    S - Number of snapshots\n"
+"\n"
+"    t - Type (persistent or ephemeral)\n"
+"\n"
+"Custom columns are defined with \"key[:name][:maxWidth]\":\n"
+"\n"
+"    KEY: The (extended) config key to display\n"
+"\n"
+"    NAME: Name to display in the column header.\n"
+"    Defaults to the key if not specified or empty.\n"
+"\n"
+"    MAXWIDTH: Max width of the column (longer results are truncated).\n"
+"    Defaults to -1 (unlimited). Use 0 to limit to the column header size.\n"
+"\n"
+"*Examples*\n"
+"lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:"
+"MAC\n"
+"    Shows a list of containers using the \"NAME\", \"BASE IMAGE\", \"STATE"
+"\", \"IPV4\",\n"
+"    \"IPV6\" and \"MAC\" columns.\n"
+"\n"
+"    \"BASE IMAGE\" and \"MAC\" are custom columns generated from container "
+"configuration keys."
+msgstr ""
+
+#: lxc/manpage.go:20
+msgid ""
+"Usage: lxc manpage <directory>\n"
+"\n"
+"Generate all the LXD manpages."
+msgstr ""
+
+#: lxc/monitor.go:41
+msgid ""
+"Usage: lxc monitor [<remote>:] [--type=TYPE...]\n"
+"\n"
+"Monitor a local or remote LXD server.\n"
+"\n"
+"By default the monitor will listen to all message types.\n"
+"\n"
+"Message types to listen for can be specified with --type.\n"
+"\n"
+"*Examples*\n"
+"lxc monitor --type=logging\n"
+"    Only show log message."
+msgstr ""
+
+#: lxc/move.go:16
+msgid ""
+"Usage: lxc move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]]\n"
+"\n"
+"Move containers within or in between LXD instances.\n"
+"\n"
+"lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
+"    Move a container between two hosts, renaming it if destination name "
+"differs.\n"
+"\n"
+"lxc move <old name> <new name>\n"
+"    Rename a local container.\n"
+"\n"
+"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"    Rename a snapshot."
+msgstr ""
+
+#: lxc/network.go:49
+msgid ""
+"Usage: lxc network <subcommand> [options]\n"
+"\n"
+"Manage and attach containers to networks.\n"
+"\n"
+"lxc network list [<remote>:]\n"
+"    List available networks.\n"
+"\n"
+"lxc network show [<remote>:]<network>\n"
+"    Show details of a network.\n"
+"\n"
+"lxc network create [<remote>:]<network> [key=value...]\n"
+"    Create a network.\n"
+"\n"
+"lxc network get [<remote>:]<network> <key>\n"
+"    Get network configuration.\n"
+"\n"
+"lxc network set [<remote>:]<network> <key> <value>\n"
+"    Set network configuration.\n"
+"\n"
+"lxc network unset [<remote>:]<network> <key>\n"
+"    Unset network configuration.\n"
+"\n"
+"lxc network delete [<remote>:]<network>\n"
+"    Delete a network.\n"
+"\n"
+"lxc network edit [<remote>:]<network>\n"
+"    Edit network, either by launching external editor or reading STDIN.\n"
+"\n"
+"lxc network attach [<remote>:]<network> <container> [device name] [interface "
+"name]\n"
+"    Attach a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
+"[interface name]\n"
+"    Attach a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"*Examples*\n"
+"cat network.yaml | lxc network edit <network>\n"
+"    Update a network using the content of network.yaml"
 msgstr ""
 
-#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
+#: lxc/profile.go:49
+msgid ""
+"Usage: lxc profile <subcommand> [options]\n"
+"\n"
+"Manage container configuration profiles.\n"
+"\n"
+"*Profile configuration*\n"
+"lxc profile list [<remote>:]\n"
+"    List available profiles.\n"
+"\n"
+"lxc profile show [<remote>:]<profile>\n"
+"    Show details of a profile.\n"
+"\n"
+"lxc profile create [<remote>:]<profile>\n"
+"    Create a profile.\n"
+"\n"
+"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
+"    Copy the profile.\n"
+"\n"
+"lxc profile get [<remote>:]<profile> <key>\n"
+"    Get profile configuration.\n"
+"\n"
+"lxc profile set [<remote>:]<profile> <key> <value>\n"
+"    Set profile configuration.\n"
+"\n"
+"lxc profile unset [<remote>:]<profile> <key>\n"
+"    Unset profile configuration.\n"
+"\n"
+"lxc profile delete [<remote>:]<profile>\n"
+"    Delete a profile.\n"
+"\n"
+"lxc profile edit [<remote>:]<profile>\n"
+"    Edit profile, either by launching external editor or reading STDIN.\n"
+"\n"
+"*Profile assignment*\n"
+"lxc profile assign [<remote>:]<container> <profiles>\n"
+"    Replace the current set of profiles for the container by the one "
+"provided.\n"
+"\n"
+"lxc profile add [<remote>:]<container> <profile>\n"
+"    Add a profile to a container\n"
+"\n"
+"lxc profile remove [<remote>:]<container> <profile>\n"
+"    Remove the profile from a container\n"
+"\n"
+"*Device management*\n"
+"lxc profile device list [<remote>:]<profile>\n"
+"    List devices in the given profile.\n"
+"\n"
+"lxc profile device show [<remote>:]<profile>\n"
+"    Show full device details in the given profile.\n"
+"\n"
+"lxc profile device remove [<remote>:]<profile> <name>\n"
+"    Remove a device from a profile.\n"
+"\n"
+"lxc profile device get [<remote>:]<profile> <name> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc profile device unset [<remote>:]<profile> <name> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
+"    Add a profile device, such as a disk or a nic, to the containers using "
+"the specified profile.\n"
+"\n"
+"*Examples*\n"
+"cat profile.yaml | lxc profile edit <profile>\n"
+"    Update a profile using the content of profile.yaml\n"
+"\n"
+"lxc profile assign foo default,bar\n"
+"    Set the profiles for \"foo\" to \"default\" and \"bar\".\n"
+"\n"
+"lxc profile assign foo default\n"
+"    Reset \"foo\" to only using the \"default\" profile.\n"
+"\n"
+"lxc profile assign foo ''\n"
+"    Remove all profile from \"foo\""
+msgstr ""
+
+#: lxc/publish.go:27
+msgid ""
+"Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]\n"
+"\n"
+"Publish containers as images."
+msgstr ""
+
+#: lxc/remote.go:37
+msgid ""
+"Usage: lxc remote <subcommand> [options]\n"
+"\n"
+"Manage the list of remote LXD servers.\n"
+"\n"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
+"password=PASSWORD] [--public] [--protocol=PROTOCOL]\n"
+"    Add the remote <remote> at <url>.\n"
+"\n"
+"lxc remote remove <remote>\n"
+"    Remove the remote <remote>.\n"
+"\n"
+"lxc remote list\n"
+"    List all remotes.\n"
+"\n"
+"lxc remote rename <old name> <new name>\n"
+"    Rename remote <old name> to <new name>.\n"
+"\n"
+"lxc remote set-url <remote> <url>\n"
+"    Update <remote>'s url to <url>.\n"
+"\n"
+"lxc remote set-default <remote>\n"
+"    Set the default remote.\n"
+"\n"
+"lxc remote get-default\n"
+"    Print the default remote."
+msgstr ""
+
+#: lxc/restore.go:21
+msgid ""
+"Usage: lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"\n"
+"Restore containers from snapshots.\n"
+"\n"
+"If --stateful is passed, then the running state will be restored too.\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create the snapshot.\n"
+"\n"
+"lxc restore u1 snap0\n"
+"    Restore the snapshot."
+msgstr ""
+
+#: lxc/snapshot.go:21
+msgid ""
+"Usage: lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"Create container snapshots.\n"
+"\n"
+"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"running state, including process memory state, TCP connections, ...\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create a snapshot of \"u1\" called \"snap0\"."
+msgstr ""
+
+#: lxc/storage.go:61
+msgid ""
+"Usage: lxc storage <subcommand> [options]\n"
+"\n"
+"Manage storage pools and volumes.\n"
+"\n"
+"*Storage pools*\n"
+"lxc storage list [<remote>:]\n"
+"    List available storage pools.\n"
+"\n"
+"lxc storage show [<remote>:]<pool>\n"
+"    Show details of a storage pool.\n"
+"\n"
+"lxc storage create [<remote>:]<pool> <driver> [key=value]...\n"
+"    Create a storage pool.\n"
+"\n"
+"lxc storage get [<remote>:]<pool> <key>\n"
+"    Get storage pool configuration.\n"
+"\n"
+"lxc storage set [<remote>:]<pool> <key> <value>\n"
+"    Set storage pool configuration.\n"
+"\n"
+"lxc storage unset [<remote>:]<pool> <key>\n"
+"    Unset storage pool configuration.\n"
+"\n"
+"lxc storage delete [<remote>:]<pool>\n"
+"    Delete a storage pool.\n"
+"\n"
+"lxc storage edit [<remote>:]<pool>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Storage volumes*\n"
+"lxc storage volume list [<remote>:]<pool>\n"
+"    List available storage volumes on a storage pool.\n"
+"\n"
+"lxc storage volume show [<remote>:]<pool> <volume>\n"
+"    Show details of a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...\n"
+"    Create a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume get [<remote>:]<pool> <volume> <key>\n"
+"    Get storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>\n"
+"    Set storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume unset [<remote>:]<pool> <volume> <key>\n"
+"    Unset storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume delete [<remote>:]<pool> <volume>\n"
+"    Delete a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
+"name] <path>\n"
+"    Attach a storage volume to the specified container.\n"
+"\n"
+"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name] <path>\n"
+"    Attach a storage volume to the specified profile.\n"
+"\n"
+"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
+"name]\n"
+"    Detach a storage volume from the specified container.\n"
+"\n"
+"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name]\n"
+"    Detach a storage volume from the specified profile.\n"
+"\n"
+"Unless specified through a prefix, all volume operations affect \"custom"
+"\" (user created) volumes.\n"
+"\n"
+"*Examples*\n"
+"cat pool.yaml | lxc storage edit [<remote>:]<pool>\n"
+"    Update a storage pool using the content of pool.yaml.\n"
+"\n"
+"cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Update a storage volume using the content of pool.yaml.\n"
+"\n"
+"lxc storage volume show default data\n"
+"    Will show the properties of a custom volume called \"data\" in the "
+"\"default\" pool.\n"
+"\n"
+"lxc storage volume show default container/data\n"
+"    Will show the properties of the filesystem for a container called \"data"
+"\" in the \"default\" pool."
+msgstr ""
+
+#: lxc/version.go:18
+msgid ""
+"Usage: lxc version\n"
+"\n"
+"Print the version number of this client tool."
+msgstr ""
+
+#: lxc/delete.go:45
+msgid "User aborted delete operation."
+msgstr ""
+
+#: lxc/restore.go:37
+msgid ""
+"Whether or not to restore the container's running state from snapshot (if "
+"available)"
+msgstr ""
+
+#: lxc/snapshot.go:35
+msgid "Whether or not to snapshot the container's running state"
+msgstr ""
+
+#: lxc/network.go:446 lxc/remote.go:370 lxc/remote.go:375
+msgid "YES"
+msgstr ""
+
+#: lxc/main.go:55
+msgid "`lxc config profile` is deprecated, please use `lxc profile`"
+msgstr ""
+
+#: lxc/launch.go:130
+msgid "bad number of things scanned from image, container or snapshot"
+msgstr ""
+
+#: lxc/action.go:94
+msgid "bad result type from action"
+msgstr ""
+
+#: lxc/copy.go:116
+msgid "can't copy to the same container name"
+msgstr ""
+
+#: lxc/file.go:316
+msgid "can't pull a directory without --recursive"
+msgstr ""
+
+#: lxc/remote.go:358
+msgid "can't remove the default remote"
+msgstr ""
+
+#: lxc/file.go:127
+msgid "can't supply uid/gid/mode in recursive mode"
+msgstr ""
+
+#: lxc/remote.go:384
+msgid "default"
+msgstr ""
+
+#: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
+#: lxc/init.go:234 lxc/init.go:239 lxc/launch.go:114 lxc/launch.go:119
+msgid "didn't get any affected image, container or snapshot from server"
+msgstr ""
+
+#: lxc/image.go:307
+msgid "disabled"
+msgstr ""
+
+#: lxc/image.go:309
+msgid "enabled"
+msgstr ""
+
+#: lxc/action.go:126 lxc/main.go:25 lxc/main.go:159
+#, c-format
+msgid "error: %v"
+msgstr ""
+
+#: lxc/help.go:37 lxc/main.go:106
+#, c-format
+msgid "error: unknown command: %s"
+msgstr ""
+
+#: lxc/launch.go:134
+msgid "got bad version"
+msgstr ""
+
+#: lxc/image.go:302 lxc/image.go:591
+msgid "no"
+msgstr ""
+
+#: lxc/copy.go:165
+msgid "not all the profiles from the source exist on the target"
+msgstr ""
+
+#: lxc/remote.go:232
+msgid "ok (y/n)?"
+msgstr ""
+
+#: lxc/main.go:331 lxc/main.go:335
+#, c-format
+msgid "processing aliases failed %s\n"
+msgstr ""
+
+#: lxc/file.go:383
+msgid "recursive edit doesn't make sense :("
+msgstr ""
+
+#: lxc/remote.go:420
+#, c-format
+msgid "remote %s already exists"
+msgstr ""
+
+#: lxc/remote.go:350 lxc/remote.go:412 lxc/remote.go:447 lxc/remote.go:463
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:319
+#: lxc/remote.go:333
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
+#: lxc/remote.go:354 lxc/remote.go:416 lxc/remote.go:451
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/info.go:219
+#: lxc/info.go:221
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:221
+#: lxc/info.go:223
 msgid "stateless"
 msgstr ""
 
-#: lxc/info.go:215
+#: lxc/info.go:217
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -1729,11 +1875,11 @@ msgstr ""
 msgid "unreachable return reached"
 msgstr ""
 
-#: lxc/main.go:237
+#: lxc/main.go:262
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:302 lxc/image.go:593
+#: lxc/delete.go:44 lxc/image.go:304 lxc/image.go:595
 msgid "yes"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 7fd7400..fdcac2e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-03-05 02:20-0500\n"
+"POT-Creation-Date: 2017-03-05 02:21-0500\n"
 "PO-Revision-Date: 2017-02-24 23:43+0000\n"
 "Last-Translator: Christophe CHAUVET <christophe.chauvet at gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -203,142 +203,121 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
-#: lxc/image.go:586
+#: lxc/image.go:588
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (%d de plus)"
 
-#: lxc/snapshot.go:61
+#: lxc/snapshot.go:58
 msgid "'/' not allowed in snapshot name"
 msgstr "'/' n'est pas autorisé dans le nom d'un instantané"
 
-#: lxc/profile.go:254
+#: lxc/profile.go:293
 msgid "(none)"
 msgstr "(aucun)"
 
-#: lxc/image.go:607 lxc/image.go:649
+#: lxc/image.go:609 lxc/image.go:651
 msgid "ALIAS"
 msgstr "ALIAS"
 
-#: lxc/image.go:611
+#: lxc/image.go:613
 msgid "ARCH"
 msgstr "ARCH"
 
-#: lxc/list.go:406
+#: lxc/list.go:430
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTURE"
 
-#: lxc/remote.go:51
+#: lxc/remote.go:65
 msgid "Accept certificate"
 msgstr "Accepter le certificat"
 
-#: lxc/remote.go:267
+#: lxc/remote.go:281
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Mot de passe administrateur pour %s : "
 
-#: lxc/image.go:334
+#: lxc/image.go:336
 msgid "Aliases:"
 msgstr "Alias :"
 
-#: lxc/image.go:312 lxc/info.go:93
+#: lxc/image.go:314 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architecture : %s"
 
-#: lxc/image.go:338
+#: lxc/image.go:340
 #, c-format
 msgid "Auto update: %s"
 msgstr "Mise à jour auto. : %s"
 
-#: lxc/help.go:49
-msgid "Available commands:"
-msgstr "Commandes disponibles :"
-
-#: lxc/info.go:186
+#: lxc/info.go:188
 msgid "Bytes received"
 msgstr "Octets reçus"
 
-#: lxc/info.go:187
+#: lxc/info.go:189
 msgid "Bytes sent"
 msgstr "Octets émis"
 
-#: lxc/config.go:274
+#: lxc/config.go:310
 msgid "COMMON NAME"
 msgstr "COMMON NAME"
 
-#: lxc/info.go:150
+#: lxc/info.go:152
 msgid "CPU usage (in seconds)"
 msgstr "CPU utilisé (en secondes)"
 
-#: lxc/info.go:154
+#: lxc/info.go:156
 msgid "CPU usage:"
 msgstr "CPU utilisé :"
 
-#: lxc/list.go:407
+#: lxc/list.go:431
 msgid "CREATED AT"
 msgstr "CRÉÉ À"
 
-#: lxc/config.go:114 lxc/network.go:471
+#: lxc/config.go:150 lxc/network.go:495
 #, c-format
 msgid "Can't read from stdin: %s"
 msgstr "Impossible de lire depuis stdin : %s"
 
-#: lxc/config.go:127 lxc/config.go:160 lxc/config.go:182
+#: lxc/config.go:163 lxc/config.go:196 lxc/config.go:218
 #, c-format
 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 actuellement."
 
-#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
+#: lxc/network.go:422 lxc/profile.go:472 lxc/storage.go:579
 msgid "Cannot provide container name to list"
 msgstr "Impossible de fournir le nom du conteneur à lister"
 
-#: lxc/remote.go:217
+#: lxc/remote.go:231
 #, c-format
 msgid "Certificate fingerprint: %x"
 msgstr "Empreinte du certificat : %x"
 
-#: lxc/action.go:36
-#, c-format
-msgid ""
-"Change state of one or more containers to %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-msgstr ""
-"Change l'état d'un ou plusieurs conteneurs à %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/finger.go:15
-msgid ""
-"Check if the LXD instance is up.\n"
-"\n"
-"lxc finger [<remote>:]"
-msgstr ""
-"Vérifier si l'instance LXD est active.\n"
-"\n"
-"lxc finger [<remote>:]"
-
-#: lxc/remote.go:290
+#: lxc/remote.go:304
 msgid "Client certificate stored at server: "
 msgstr "Certificat client enregistré sur le serveur : "
 
-#: lxc/list.go:101 lxc/list.go:102
+#: lxc/list.go:125 lxc/list.go:126
 msgid "Columns"
 msgstr "Colonnes"
 
-#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:137 lxc/init.go:138
+#: lxc/help.go:53
+msgid "Commands:"
+msgstr ""
+
+#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:135 lxc/init.go:136
 msgid "Config key/value to apply to the new container"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
-#: lxc/config.go:535 lxc/config.go:600 lxc/image.go:703 lxc/network.go:354
-#: lxc/profile.go:218 lxc/storage.go:497 lxc/storage.go:802
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:705 lxc/network.go:378
+#: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:840
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "Erreur lors de la lecture de la configuration : %s"
 
-#: lxc/main.go:29
+#: lxc/main.go:32
 msgid "Connection refused; is LXD running?"
 msgstr "Connexion refusée ; LXD est-il actif ?"
 
@@ -346,7 +325,7 @@ msgstr "Connexion refusée ; LXD est-il actif ?"
 msgid "Container name is mandatory"
 msgstr "Le nom du conteneur est obligatoire"
 
-#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:246
+#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:244
 #, c-format
 msgid "Container name is: %s"
 msgstr "Le nom du conteneur est : %s"
@@ -356,94 +335,47 @@ msgstr "Le nom du conteneur est : %s"
 msgid "Container published with fingerprint: %s"
 msgstr "Conteneur publié avec l'empreinte : %s"
 
-#: lxc/image.go:132
+#: lxc/image.go:134
 msgid "Copy aliases from source"
 msgstr "Copier les alias depuis la source"
 
-#: lxc/copy.go:25
-msgid ""
-"Copy containers within or in between LXD instances.\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
-"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-msgstr ""
-"Copier les conteneurs dans ou depuis les instances LXD.\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
-"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-
-#: lxc/image.go:245
+#: lxc/image.go:247
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Copie de l'image : %s"
 
-#: lxc/remote.go:232
+#: lxc/remote.go:246
 msgid "Could not create server cert dir"
 msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 
-#: lxc/file.go:84
+#: lxc/file.go:91
 #, c-format
 msgid "Could not sanitize path %s"
 msgstr "Impossible d'assainir le chemin %s"
 
-#: lxc/snapshot.go:21
-msgid ""
-"Create a read-only snapshot of a container.\n"
-"\n"
-"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Creates a snapshot of the container (optionally with the container's memory\n"
-"state). When --stateful is used, LXD attempts to checkpoint the container's\n"
-"running state, including process memory state, TCP connections, etc. so that "
-"it\n"
-"can be restored (via lxc restore) at a later time (although some things, e."
-"g.\n"
-"TCP connections after the TCP timeout window has expired, may not be "
-"restored\n"
-"successfully).\n"
-"\n"
-"Example:\n"
-"    lxc snapshot u1 snap0"
-msgstr ""
-"Créer un instantané en lecture seule d'un conteneur.\n"
-"\n"
-"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Crée un instantanté du conteneur (y compris — de manière optionnelle —\n"
-"l'état de la mémoire du conteneur).  Si --stateful est utilisé, LXD\n"
-"tente de créer un point d'arrêt de l'état d'exécution du conteneur,\n"
-"incluant l'état de la mémoire, les connexions TCP, etc. afin qu'il\n"
-"puisse être restauré (via lxc restore) ultérieurement (bien que\n"
-"certaines choses, les connexions TCP ayant expirées après que la\n"
-"fenêtre de temps se soit écoulée par exemple, ne puissent être\n"
-"restaurées avec succès).\n"
-"\n"
-"Exemple :\n"
-"    lxc snapshot u1 snap0"
-
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:67 lxc/file.go:68
 msgid "Create any directories necessary"
 msgstr "Créer tous répertoires nécessaires"
 
-#: lxc/image.go:317 lxc/info.go:95
+#: lxc/image.go:319 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr "Créé : %s"
 
-#: lxc/init.go:184 lxc/launch.go:139
+#: lxc/init.go:182 lxc/launch.go:137
 #, c-format
 msgid "Creating %s"
 msgstr "Création de %s"
 
-#: lxc/init.go:182
+#: lxc/init.go:180
 msgid "Creating the container"
 msgstr "Création du conteneur"
 
-#: lxc/image.go:610 lxc/image.go:651
+#: lxc/image.go:612 lxc/image.go:653
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: lxc/storage.go:570
+#: lxc/storage.go:608
 msgid "DRIVER"
 msgstr "PILOTE"
 
@@ -451,52 +383,34 @@ msgstr "PILOTE"
 msgid "Define a compression algorithm: for image or none"
 msgstr "Définir un algorithme de compression : pour image ou aucun"
 
-#: lxc/delete.go:26
-msgid ""
-"Delete containers or snapshots.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Destroy containers or snapshots with any attached data (configuration, "
-"snapshots, ...)."
-msgstr ""
-"Supprimer des conteneurs ou des instantanés.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
-"(configuration, instantanés, …)."
-
-#: lxc/config.go:652
+#: lxc/config.go:688
 #, c-format
 msgid "Device %s added to %s"
 msgstr "Périphérique %s ajouté à %s"
 
-#: lxc/config.go:839
+#: lxc/config.go:875
 #, c-format
 msgid "Device %s removed from %s"
 msgstr "Périphérique %s retiré de %s"
 
-#: lxc/info.go:143
+#: lxc/info.go:145
 #, fuzzy
 msgid "Disk usage:"
 msgstr "  Disque utilisé :"
 
-#: lxc/list.go:554
+#: lxc/list.go:578
 msgid "EPHEMERAL"
 msgstr "ÉPHÉMÈRE"
 
-#: lxc/config.go:276
+#: lxc/config.go:312
 msgid "EXPIRY DATE"
 msgstr "DATE D'EXPIRATION"
 
-#: lxc/main.go:41
+#: lxc/main.go:44
 msgid "Enable debug mode"
 msgstr "Activer le mode de débogage"
 
-#: lxc/main.go:40
+#: lxc/main.go:43
 msgid "Enable verbose mode"
 msgstr "Activer le mode verbeux"
 
@@ -504,11 +418,11 @@ msgstr "Activer le mode verbeux"
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "Variable d'environnement (de la forme HOME=/home/foo) à positionner"
 
-#: lxc/help.go:69
+#: lxc/help.go:77
 msgid "Environment:"
 msgstr "Environnement :"
 
-#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:141 lxc/init.go:142
+#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:139 lxc/init.go:140
 msgid "Ephemeral container"
 msgstr "Conteneur éphémère"
 
@@ -516,154 +430,106 @@ msgstr "Conteneur éphémère"
 msgid "Event type to listen for"
 msgstr "Type d'évènements à surveiller"
 
-#: lxc/exec.go:46
-msgid ""
-"Execute the specified command in a container.\n"
-"\n"
-"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
-"env KEY=VALUE...] [--] <command line>\n"
-"\n"
-"Mode defaults to non-interactive, interactive mode is selected if both stdin "
-"AND stdout are terminals (stderr is ignored)."
-msgstr ""
-"Exécuter la commande indiquée dans un conteneur.\n"
-"\n"
-"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
-"env KEY=VALUE...] [--] <command line>\n"
-"\n"
-"Le mode est non-interactif par défaut, le mode interactif est\n"
-"sélectionné si à la fois stdin et stdout sont des terminaux (stderr\n"
-"est ignoré)."
-
-#: lxc/image.go:321
+#: lxc/image.go:323
 #, c-format
 msgid "Expires: %s"
 msgstr "Expire : %s"
 
-#: lxc/image.go:323
+#: lxc/image.go:325
 msgid "Expires: never"
 msgstr "N'expire jamais"
 
-#: lxc/config.go:273 lxc/image.go:608 lxc/image.go:650
+#: lxc/config.go:309 lxc/image.go:610 lxc/image.go:652
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
-#: lxc/list.go:104
-msgid "Fast mode (same as --columns=nsacPt"
+#: lxc/manpage.go:62
+#, c-format
+msgid "Failed to generate 'lxc.%s.1': %v"
+msgstr ""
+
+#: lxc/manpage.go:55
+#, c-format
+msgid "Failed to generate 'lxc.1': %v"
+msgstr ""
+
+#: lxc/list.go:128
+#, fuzzy
+msgid "Fast mode (same as --columns=nsacPt)"
 msgstr "Mode rapide (identique à --columns=nsacPt"
 
-#: lxc/image.go:310
+#: lxc/image.go:312
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Empreinte : %s"
 
-#: lxc/action.go:45 lxc/action.go:46
+#: lxc/action.go:46 lxc/action.go:47
 msgid "Force the container to shutdown"
 msgstr "Forcer le conteneur à s'arrêter"
 
-#: lxc/delete.go:35 lxc/delete.go:36
+#: lxc/delete.go:33 lxc/delete.go:34
 msgid "Force the removal of stopped containers"
 msgstr "Forcer la suppression des conteneurs arrêtés"
 
-#: lxc/main.go:42
+#: lxc/main.go:45
 msgid "Force using the local unix socket"
 msgstr "Forcer l'utilisation de la socket unix locale"
 
-#: lxc/image.go:135 lxc/list.go:103
+#: lxc/image.go:137 lxc/list.go:127
 msgid "Format"
 msgstr "Format"
 
-#: lxc/remote.go:65
+#: lxc/remote.go:79
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "Génération d'un certificat client. Ceci peut prendre une minute…"
 
-#: lxc/help.go:25
-msgid ""
-"Help page for the LXD client.\n"
-"\n"
-"lxc help [--all]"
-msgstr ""
-"Page d'aide du client LXD.\n"
-"\n"
-"lxc help [--all]"
-
-#: lxc/list.go:404
+#: lxc/list.go:428
 msgid "IPV4"
 msgstr "IPv4"
 
-#: lxc/list.go:405
+#: lxc/list.go:429
 msgid "IPV6"
 msgstr "IPv6"
 
-#: lxc/config.go:275
+#: lxc/config.go:311
 msgid "ISSUE DATE"
 msgstr "DATE D'ÉMISSION"
 
-#: lxc/main.go:136
+#: lxc/main.go:139
 #, fuzzy
 msgid "If this is your first time using LXD, you should also run: lxd init"
 msgstr ""
 "Si c'est la première fois que vous lancez LXD, vous devriez aussi lancer : "
 "sudo lxd init"
 
-#: lxc/main.go:43
+#: lxc/main.go:46
 msgid "Ignore aliases when determining what command to run"
 msgstr "Ignorer les alias pour déterminer la commande à exécuter"
 
-#: lxc/action.go:49
+#: lxc/action.go:50
 msgid "Ignore the container state (only for start)"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/image.go:248
+#: lxc/image.go:250
 msgid "Image copied successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:393 lxc/image.go:405
+#: lxc/image.go:395 lxc/image.go:407
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Image importée avec l'empreinte : %s"
 
-#: lxc/image.go:390
+#: lxc/image.go:392
 #, c-format
 msgid "Importing the image: %s"
 msgstr "Import de l'image : %s"
 
-#: lxc/init.go:75
-#, fuzzy
-msgid ""
-"Initialize a container from a particular image.\n"
-"\n"
-"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
-"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--"
-"storage|-s <pool>]\n"
-"\n"
-"Initializes a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc init ubuntu:16.04 u1"
-msgstr ""
-"Initialiser un conteneur avec une image particulière.\n"
-"\n"
-"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
-"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>]\n"
-"\n"
-"Initialise un conteneur en utilisant l'image et le nom indiqués.\n"
-"\n"
-"Ne pas utiliser -p résultera en l'utilisation du profil par défaut.\n"
-"Utiliser \"-p\" sans argument résultera en aucun profil.\n"
-"\n"
-"Exemple :\n"
-"    lxc init ubuntu:16.04 u1"
-
-#: lxc/remote.go:135
+#: lxc/remote.go:149
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr "Schème d'URL invalide \"%s\" in \"%s\""
 
-#: lxc/config.go:254
+#: lxc/config.go:290
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
@@ -671,414 +537,692 @@ msgstr "Certificat invalide"
 msgid "Invalid configuration key"
 msgstr "Clé de configuration invalide"
 
-#: lxc/file.go:352
+#: lxc/file.go:359
 #, fuzzy, c-format
 msgid "Invalid path %s"
 msgstr "Cible invalide %s"
 
-#: lxc/file.go:286
+#: lxc/file.go:293
 #, c-format
 msgid "Invalid source %s"
 msgstr "Source invalide %s"
 
-#: lxc/file.go:73
+#: lxc/file.go:80
 #, c-format
 msgid "Invalid target %s"
 msgstr "Cible invalide %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:126
 msgid "Ips:"
 msgstr "IPs :"
 
-#: lxc/image.go:133
+#: lxc/image.go:135
 msgid "Keep the image up to date after initial copy"
 msgstr "Garder l'image à jour après la copie initiale"
 
-#: lxc/list.go:408
+#: lxc/list.go:432
 msgid "LAST USED AT"
 msgstr "DERNIÈRE UTILISATION À"
 
-#: lxc/main.go:27
+#: lxc/main.go:30
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr "Socket LXD introuvable ; LXD est-il installé et actif ?"
 
-#: lxc/image.go:326
+#: lxc/image.go:328
 #, c-format
 msgid "Last used: %s"
 msgstr "Dernière utilisation : %s"
 
-#: lxc/image.go:328
+#: lxc/image.go:330
 msgid "Last used: never"
 msgstr "Dernière utilisation : jamais"
 
-#: lxc/launch.go:23
-#, fuzzy
-msgid ""
-"Launch a container from a particular image.\n"
-"\n"
-"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
-"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
-"<network>] [--storage|-s <pool>]\n"
-"\n"
-"Launches a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc launch ubuntu:16.04 u1"
-msgstr ""
-"Lancer le conteneur depuis une image particulière.\n"
-"\n"
-"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
-"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
-"<network>]\n"
-"\n"
-"Lance un conteneur en utilisant l'image et le nom indiqués.\n"
-"\n"
-"Ne pas utiliser -p résultera en l'utilisation du profil par défaut.\n"
-"Utiliser \"-p\" sans argument résultera en aucun profil.\n"
-"\n"
-"Exemple :\n"
-"    lxc launch ubuntu:16.04 u1"
-
-#: lxc/info.go:25
-msgid ""
-"List information on LXD servers and containers.\n"
-"\n"
-"For a container:\n"
-"    lxc info [<remote:>]<container> [--show-log]\n"
-"\n"
-"For a server:\n"
-"    lxc info [<remote:>]"
-msgstr ""
-"Lister les informations concernant les serveurs LXD et les conteneurs.\n"
-"\n"
-"Pour un conteneur :\n"
-"    lxc info [<remote>:]<container> [--show-log]\n"
-"\n"
-"Pour un serveur :\n"
-"    lxc info [<remote>:]"
-
-#: lxc/list.go:47
-#, fuzzy
-msgid ""
-"Lists the containers.\n"
-"\n"
-"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
-"fast]\n"
-"\n"
-"The filters are:\n"
-"* A single keyword like \"web\" which will list any container with a name "
-"starting by \"web\".\n"
-"* A regular expression on the container name. (e.g. .*web.*01$)\n"
-"* A key/value pair referring to a configuration item. For those, the "
-"namespace can be abbreviated to the smallest unambiguous identifier:\n"
-" * \"user.blah=abc\" will list all containers with the \"blah\" user "
-"property set to \"abc\".\n"
-" * \"u.blah=abc\" will do the same\n"
-" * \"security.privileged=1\" will list all privileged containers\n"
-" * \"s.privileged=1\" will do the same\n"
-"* A regular expression matching a configuration item or its value. (e.g. "
-"volatile.eth0.hwaddr=00:16:3e:.*)\n"
-"\n"
-"The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table format.\n"
-"Column arguments are either pre-defined shorthand chars (see below),\n"
-"or (extended) config keys.  Commas between consecutive shorthand chars\n"
-"are optional.\n"
-"\n"
-"Pre-defined shorthand chars:\n"
-"* 4 - IPv4 address\n"
-"* 6 - IPv6 address\n"
-"* a - architecture\n"
-"* b - storage pool\n"
-"* c - creation date\n"
-"* l - last used date\n"
-"* n - name\n"
-"* p - pid of container init process\n"
-"* P - profiles\n"
-"* s - state\n"
-"* S - number of snapshots\n"
-"* t - type (persistent or ephemeral)\n"
-"\n"
-"Config key syntax: key[:name][:maxWidth]\n"
-"* key      - The (extended) config key to display\n"
-"* name     - Name to display in the column header, defaults to the key\n"
-"             if not specified or if empty (to allow defining maxWidth\n"
-"             without a custom name, e.g. user.key::0)\n"
-"* maxWidth - Max width of the column (longer results are truncated).\n"
-"             -1 == unlimited\n"
-"              0 == width of column header\n"
-"             >0 == max width in chars\n"
-"             Default is -1 (unlimited)\n"
-"\n"
-"Default column layout: ns46tS\n"
-"Fast column layout: nsacPt\n"
-"\n"
-"Example:\n"
-"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
-"hwaddr:MAC"
-msgstr ""
-"Lister les conteneurs.\n"
-"\n"
-"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
-"fast]\n"
-"\n"
-"Les filtres sont :\n"
-"* Un mot-clé unique comme \\web\\ qui listera tous les conteneurs dont le "
-"nom commence par \\web\\.\n"
-"* Une expression rationnelle sur le nom du conteneur (ex : *web.*01$)\n"
-"* Une paire de clé/valeur faisant référence à un élément de configuration.  "
-"Pour ceux-ci, l'espace de nom peut être abrégé au plus petit identifiant non "
-"ambigu :\n"
-" * \\user.blah=abc\\ listera tous les conteneurs dont la propriété "
-"utilisateur \\blah\\ est positionnée à \\abc\\.\n"
-" * \\u.blah=abc\\ fera la même chose\n"
-" * \\security.privileged=1\\ listera tous les conteneurs privilégiés\n"
-" * \\s.privileged=1\\ fera la même chose\n"
-"* Une expression rationelle correspondant à un élément de configuration ou à "
-"sa valeur (ex : volatile.eth0.hwaddr=00:16:3e:.*)\n"
-"\n"
-"L'option -c prend une liste d'arguments séparés par des virgules\n"
-"contrôlant les attributs des conteneurs à afficher au format tableau.\n"
-"Les arguments pour les colonnes sont soient des raccourcis par\n"
-"caractère prédéfinis (voir ci-dessous) ou des clés (étendues) de\n"
-"configuration.  Les virgules entre les caractères courts sont\n"
-"optionnelles.\n"
-"\n"
-"Raccourcis par caractère prédéfinis :\n"
-"* 4 - adresse IPv4\n"
-"* 6 - adresse IPv6\n"
-"* a - architecture\n"
-"* c - date de création\n"
-"* l - date de dernière utilisation\n"
-"* n - nom\n"
-"* p - pid du processus init du conteneur\n"
-"* P - profils\n"
-"* s - état\n"
-"* S - nombre d'instantanés\n"
-"* t - type (persistant ou éphémère)\n"
-"\n"
-"Syntaxe des clés de configuration : clé[:nom][:largeurMax]\n"
-"* clé        - La clé (étendue) de configuration à afficher\n"
-"* nom        - Nom à afficher dans l'entête de colonne, c'est la clé\n"
-"               par défaut si rien n'est spécifié ou vide (pour\n"
-"               permettre la définition de largeurMax sans nom\n"
-"               personnalisé, ex : user.key::0)\n"
-"* largeurMax - Largeur max de la colonne (les résultats plus longs\n"
-"               seront tronqués).\n"
-"               -1 == pas de limite\n"
-"                0 == largeur de l'entête de colonne\n"
-"               >0 == largeur maximale en caractères\n"
-"               La valeur par défaut est -1 (pas de limite)\n"
-"\n"
-"Colonnes par défaut : ns46tS\n"
-"Colonnes en mode rapide : nsacPt\n"
-"\n"
-"Exemple :\n"
-"    lxc list -c n,volatile.base_image:\\BASE IMAGE\\:0,s46,volatile.eth0."
-"hwaddr:MAC"
-
-#: lxc/info.go:239
+#: lxc/info.go:241
 msgid "Log:"
 msgstr "Journal : "
 
-#: lxc/network.go:436
+#: lxc/network.go:460
 msgid "MANAGED"
 msgstr "GÉRÉ"
 
-#: lxc/image.go:131
+#: lxc/image.go:133
 msgid "Make image public"
 msgstr "Rendre l'image publique"
 
-#: lxc/publish.go:34
-msgid "Make the image public"
-msgstr "Rendre l'image publique"
+#: lxc/publish.go:34
+msgid "Make the image public"
+msgstr "Rendre l'image publique"
+
+#: lxc/info.go:163
+msgid "Memory (current)"
+msgstr "Mémoire (courante)"
+
+#: lxc/info.go:167
+msgid "Memory (peak)"
+msgstr "Mémoire (pointe)"
+
+#: lxc/info.go:179
+#, fuzzy
+msgid "Memory usage:"
+msgstr "  Mémoire utilisée :"
+
+#: lxc/utils.go:173
+msgid "Missing summary."
+msgstr "Résumé manquant."
+
+#: lxc/network.go:248 lxc/network.go:297 lxc/storage.go:362 lxc/storage.go:462
+msgid "More than one device matches, specify the device name."
+msgstr "Plus d'un périphérique correspond, spécifier le nom du périphérique."
+
+#: lxc/file.go:281
+msgid "More than one file to download, but target is not a directory"
+msgstr ""
+"Plusieurs fichiers à télécharger, mais la destination n'est pas un dossier"
+
+#: lxc/action.go:68
+msgid "Must supply container name for: "
+msgstr "Vous devez fournir le nom d'un conteneur pour : "
+
+#: lxc/list.go:433 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:394
+#: lxc/storage.go:607 lxc/storage.go:687
+msgid "NAME"
+msgstr "NOM"
+
+#: lxc/network.go:444 lxc/remote.go:368 lxc/remote.go:373
+msgid "NO"
+msgstr "NON"
+
+#: lxc/info.go:91
+#, c-format
+msgid "Name: %s"
+msgstr "Nom : %s"
+
+#: lxc/network.go:222
+#, c-format
+msgid "Network %s created"
+msgstr "Le réseau %s a été créé"
+
+#: lxc/network.go:325
+#, c-format
+msgid "Network %s deleted"
+msgstr "Le réseau %s a été supprimé"
+
+#: lxc/init.go:141 lxc/init.go:142
+msgid "Network name"
+msgstr "Nom du réseau"
+
+#: lxc/info.go:196
+#, fuzzy
+msgid "Network usage:"
+msgstr "  Réseau utilisé :"
+
+#: lxc/image.go:136 lxc/publish.go:35
+msgid "New alias to define at target"
+msgstr "Nouvel alias à définir sur la cible"
+
+#: lxc/config.go:321
+msgid "No certificate provided to add"
+msgstr "Un certificat à ajouter n'a pas été fourni"
+
+#: lxc/network.go:257 lxc/network.go:306
+msgid "No device found for this network"
+msgstr "Aucun périphérique existant pour ce réseau"
+
+#: lxc/storage.go:371 lxc/storage.go:471
+#, fuzzy
+msgid "No device found for this storage volume."
+msgstr "Aucun périphérique existant pour ce réseau"
+
+#: lxc/config.go:344
+msgid "No fingerprint specified."
+msgstr "Aucune empreinte n'a été indiquée."
+
+#: lxc/storage.go:323 lxc/storage.go:407
+msgid "Only \"custom\" volumes can be attached to containers."
+msgstr "Seul les volumes \"custom\" peuvent être attaché aux conteneurs."
+
+#: lxc/remote.go:134
+msgid "Only https URLs are supported for simplestreams"
+msgstr "Seules les URLs https sont supportées par simplestreams"
+
+#: lxc/image.go:398
+msgid "Only https:// is supported for remote image import."
+msgstr "Seul https:// est supporté par l'import d'images distantes."
+
+#: lxc/network.go:354 lxc/network.go:481
+msgid "Only managed networks can be modified."
+msgstr "Seuls les réseaux gérés par LXD peuvent être modifiés."
+
+#: lxc/help.go:71 lxc/main.go:112 lxc/main.go:163
+msgid "Options:"
+msgstr "Options :"
+
+#: lxc/image.go:509
+#, c-format
+msgid "Output is in %s"
+msgstr "Le résultat est dans %s"
+
+#: lxc/exec.go:56
+msgid "Override the terminal mode (auto, interactive or non-interactive)"
+msgstr "Surcharger le mode terminal (auto, interactif ou non-interactif)"
+
+#: lxc/list.go:580
+msgid "PERSISTENT"
+msgstr "PERSISTANT"
+
+#: lxc/list.go:434
+msgid "PID"
+msgstr "PID"
+
+#: lxc/list.go:435
+msgid "PROFILES"
+msgstr "PROFILS"
+
+#: lxc/remote.go:396
+msgid "PROTOCOL"
+msgstr "PROTOCOLE"
+
+#: lxc/image.go:611 lxc/remote.go:397
+msgid "PUBLIC"
+msgstr "PUBLIC"
+
+#: lxc/info.go:190
+msgid "Packets received"
+msgstr "Paquets reçus"
+
+#: lxc/info.go:191
+msgid "Packets sent"
+msgstr "Paquets émis"
+
+#: lxc/help.go:78
+msgid "Path to an alternate client configuration directory"
+msgstr "Chemin vers un dossier de configuration client alternatif"
+
+#: lxc/help.go:79
+msgid "Path to an alternate server directory"
+msgstr "Chemin vers un dossier de configuration serveur alternatif"
+
+#: lxc/main.go:202
+#, fuzzy
+msgid "Pause containers."
+msgstr "Création du conteneur"
+
+#: lxc/main.go:34
+msgid "Permission denied, are you in the lxd group?"
+msgstr "Permission refusée, êtes-vous dans le groupe lxd ?"
+
+#: lxc/info.go:108
+#, c-format
+msgid "Pid: %d"
+msgstr "Pid : %d"
+
+#: lxc/network.go:379 lxc/profile.go:258 lxc/storage.go:536 lxc/storage.go:841
+msgid "Press enter to open the editor again"
+msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
+
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:706
+msgid "Press enter to start the editor again"
+msgstr "Appuyer sur Entrée pour lancer à nouveau l'éditeur"
+
+#: lxc/help.go:73
+msgid "Print debug information"
+msgstr "Afficher les informations de débogage"
+
+#: lxc/help.go:72
+msgid "Print less common commands"
+msgstr "Afficher les commandes moins communes"
+
+#: lxc/help.go:74
+msgid "Print verbose information"
+msgstr "Afficher des informations supplémentaires"
+
+#: lxc/info.go:132
+#, c-format
+msgid "Processes: %d"
+msgstr "Processus : %d"
+
+#: lxc/profile.go:314
+#, c-format
+msgid "Profile %s added to %s"
+msgstr "Profil %s ajouté à %s"
+
+#: lxc/profile.go:209
+#, c-format
+msgid "Profile %s created"
+msgstr "Profil %s créé"
+
+#: lxc/profile.go:279
+#, c-format
+msgid "Profile %s deleted"
+msgstr "Profil %s supprimé"
+
+#: lxc/profile.go:345
+#, c-format
+msgid "Profile %s removed from %s"
+msgstr "Profil %s supprimé de %s"
+
+#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:137 lxc/init.go:138
+msgid "Profile to apply to the new container"
+msgstr "Profil à appliquer au nouveau conteneur"
+
+#: lxc/profile.go:295
+#, c-format
+msgid "Profiles %s applied to %s"
+msgstr "Profils %s appliqués à %s"
+
+#: lxc/info.go:106
+#, c-format
+msgid "Profiles: %s"
+msgstr "Profils : %s"
+
+#: lxc/image.go:332
+msgid "Properties:"
+msgstr "Propriétés :"
+
+#: lxc/remote.go:68
+msgid "Public image server"
+msgstr "Serveur d'images public"
+
+#: lxc/image.go:315
+#, c-format
+msgid "Public: %s"
+msgstr "Public : %s"
+
+#: lxc/file.go:65 lxc/file.go:66
+msgid "Recursively push or pull files"
+msgstr "Pousser ou récupérer des fichiers récursivement"
+
+#: lxc/remote.go:66
+msgid "Remote admin password"
+msgstr "Mot de passe de l'administrateur distant"
+
+#: lxc/info.go:93
+#, c-format
+msgid "Remote: %s"
+msgstr "Serveur distant : %s"
+
+#: lxc/delete.go:41
+#, c-format
+msgid "Remove %s (yes/no): "
+msgstr "Supprimer %s (oui/non) : "
+
+#: lxc/delete.go:35 lxc/delete.go:36
+msgid "Require user confirmation"
+msgstr "Requérir une confirmation de l'utilisateur"
+
+#: lxc/info.go:129
+msgid "Resources:"
+msgstr "Ressources :"
+
+#: lxc/main.go:210
+#, fuzzy
+msgid "Restart containers."
+msgstr "Création du conteneur"
+
+#: lxc/init.go:254
+#, c-format
+msgid "Retrieving image: %s"
+msgstr "Récupération de l'image : %s"
+
+#: lxc/image.go:614
+msgid "SIZE"
+msgstr "TAILLE"
+
+#: lxc/list.go:436
+msgid "SNAPSHOTS"
+msgstr "INSTANTANÉS"
+
+#: lxc/storage.go:609
+msgid "SOURCE"
+msgstr "SOURCE"
+
+#: lxc/list.go:437
+msgid "STATE"
+msgstr "ÉTAT"
+
+#: lxc/remote.go:398
+msgid "STATIC"
+msgstr "STATIQUE"
+
+#: lxc/list.go:439
+msgid "STORAGE POOL"
+msgstr ""
+
+#: lxc/remote.go:239
+msgid "Server certificate NACKed by user"
+msgstr "Certificat serveur rejeté par l'utilisateur"
+
+#: lxc/remote.go:301
+msgid "Server doesn't trust us after adding our cert"
+msgstr ""
+"Le serveur ne nous fait pas confiance après l'ajout de notre certificat"
+
+#: lxc/remote.go:67
+msgid "Server protocol (lxd or simplestreams)"
+msgstr "Protocole du serveur (lxd ou simplestreams)"
+
+#: lxc/file.go:63
+msgid "Set the file's gid on push"
+msgstr "Définir le gid du fichier lors de l'envoi"
+
+#: lxc/file.go:64
+msgid "Set the file's perms on push"
+msgstr "Définir les permissions du fichier lors de l'envoi"
+
+#: lxc/file.go:62
+msgid "Set the file's uid on push"
+msgstr "Définir l'uid du fichier lors de l'envoi"
+
+#: lxc/help.go:29
+msgid "Show all commands (not just interesting ones)"
+msgstr "Afficher toutes les comandes (pas seulement les plus intéressantes)"
+
+#: lxc/help.go:75
+msgid "Show client version"
+msgstr "Afficher la version du client"
+
+#: lxc/info.go:38
+msgid "Show the container's last 100 log lines?"
+msgstr "Afficher les 100 dernières lignes du journal du conteneur ?"
+
+#: lxc/config.go:33
+msgid "Show the expanded configuration"
+msgstr "Afficher la configuration étendue"
+
+#: lxc/image.go:313
+#, c-format
+msgid "Size: %.2fMB"
+msgstr "Taille : %.2f Mo"
+
+#: lxc/info.go:210
+msgid "Snapshots:"
+msgstr "Instantanés :"
+
+#: lxc/action.go:134
+#, fuzzy, c-format
+msgid "Some containers failed to %s"
+msgstr "L'arrêt du conteneur a échoué !"
+
+#: lxc/image.go:342
+msgid "Source:"
+msgstr "Source :"
+
+#: lxc/main.go:220
+#, fuzzy
+msgid "Start containers."
+msgstr "Création du conteneur"
+
+#: lxc/launch.go:146
+#, c-format
+msgid "Starting %s"
+msgstr "Démarrage de %s"
+
+#: lxc/info.go:100
+#, c-format
+msgid "Status: %s"
+msgstr "État : %s"
+
+#: lxc/main.go:226
+#, fuzzy
+msgid "Stop containers."
+msgstr "L'arrêt du conteneur a échoué !"
+
+#: lxc/publish.go:36 lxc/publish.go:37
+msgid "Stop the container if currently running"
+msgstr "Arrêter le conteneur s'il est en cours d'exécution"
+
+#: lxc/delete.go:105 lxc/publish.go:114
+msgid "Stopping container failed!"
+msgstr "L'arrêt du conteneur a échoué !"
+
+#: lxc/storage.go:436
+#, fuzzy, c-format
+msgid "Storage pool %s created"
+msgstr "Le réseau %s a été créé"
+
+#: lxc/storage.go:486
+#, fuzzy, c-format
+msgid "Storage pool %s deleted"
+msgstr "Le réseau %s a été supprimé"
+
+#: lxc/init.go:143 lxc/init.go:144
+msgid "Storage pool name"
+msgstr ""
+
+#: lxc/storage.go:710
+#, fuzzy, c-format
+msgid "Storage volume %s created"
+msgstr "Profil %s créé"
 
-#: lxc/profile.go:49
+#: lxc/storage.go:720
+#, fuzzy, c-format
+msgid "Storage volume %s deleted"
+msgstr "Profil %s supprimé"
+
+#: lxc/action.go:49
+msgid "Store the container state (only for stop)"
+msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
+
+#: lxc/info.go:171
+msgid "Swap (current)"
+msgstr "Swap (courant)"
+
+#: lxc/info.go:175
+msgid "Swap (peak)"
+msgstr "Swap (pointe)"
+
+#: lxc/list.go:438 lxc/network.go:459 lxc/storage.go:686
+msgid "TYPE"
+msgstr "TYPE"
+
+#: lxc/delete.go:91
+msgid "The container is currently running, stop it first or pass --force."
+msgstr ""
+"Le conteneur est en cours d'exécution, l'arrêter d'abord ou ajouter --force."
+
+#: lxc/publish.go:92
 msgid ""
-"Manage configuration profiles.\n"
-"\n"
-"lxc profile list [<remote>:]                                    List "
-"available profiles.\n"
-"lxc profile show [<remote>:]<profile>                           Show details "
-"of a profile.\n"
-"lxc profile create [<remote>:]<profile>                         Create a "
-"profile.\n"
-"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>      Copy the "
-"profile.\n"
-"lxc profile get [<remote>:]<profile> <key>                      Get profile "
-"configuration.\n"
-"lxc profile set [<remote>:]<profile> <key> <value>              Set profile "
-"configuration.\n"
-"lxc profile unset [<remote>:]<profile> <key>                    Unset "
-"profile configuration.\n"
-"lxc profile delete [<remote>:]<profile>                         Delete a "
-"profile.\n"
-"lxc profile edit [<remote>:]<profile>\n"
-"    Edit profile, either by launching external editor or reading STDIN.\n"
-"    Example: lxc profile edit <profile> # launch editor\n"
-"             cat profile.yaml | lxc profile edit <profile> # read from "
-"profile.yaml\n"
-"\n"
-"lxc profile assign [<remote>:]<container> <profiles>\n"
-"    Assign a comma-separated list of profiles to a container, in order.\n"
-"    All profiles passed in this call (and only those) will be applied\n"
-"    to the specified container, i.e. it sets the list of profiles exactly "
-"to\n"
-"    those specified in this command. To add/remove a particular profile from "
-"a\n"
-"    container, use {add|remove} below.\n"
-"    Example: lxc profile assign foo default,bar # Apply default and bar\n"
-"             lxc profile assign foo default # Only default is active\n"
-"             lxc profile assign '' # no profiles are applied anymore\n"
-"             lxc profile assign bar,default # Apply default second now\n"
-"lxc profile add [<remote>:]<container> <profile> # add a profile to a "
-"container\n"
-"lxc profile remove [<remote>:]<container> <profile> # remove the profile "
-"from a container\n"
-"\n"
-"Devices:\n"
-"lxc profile device list [<remote>:]<profile>                                "
-"List devices in the given profile.\n"
-"lxc profile device show [<remote>:]<profile>                                "
-"Show full device details in the given profile.\n"
-"lxc profile device remove [<remote>:]<profile> <name>                       "
-"Remove a device from a profile.\n"
-"lxc profile device get [<remote>:]<profile> <name> <key>                    "
-"Get a device property.\n"
-"lxc profile device set [<remote>:]<profile> <name> <key> <value>            "
-"Set a device property.\n"
-"lxc profile device unset [<remote>:]<profile> <name> <key>                  "
-"Unset a device property.\n"
-"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
-"    Add a profile device, such as a disk or a nic, to the containers using "
-"the specified profile."
+"The container is currently running. Use --force to have it stopped and "
+"restarted."
 msgstr ""
-"Gérer les profils de configuration.\n"
+"Le conteneur est en cours d'exécution. Utiliser --force pour qu'il soit "
+"arrêté et redémarré."
+
+#: lxc/init.go:327
+msgid "The container you are starting doesn't have any network attached to it."
+msgstr ""
+"Le conteneur que vous démarrez n'est attaché à aucune interface réseau."
+
+#: lxc/config.go:716 lxc/config.go:728 lxc/config.go:761 lxc/config.go:779
+#: lxc/config.go:817 lxc/config.go:835
+msgid "The device doesn't exist"
+msgstr "Le périphérique n'existe pas"
+
+#: lxc/init.go:311
+#, c-format
+msgid "The local image '%s' couldn't be found, trying '%s:' instead."
+msgstr "L'image locale '%s' n'a pas été trouvée, essayer '%s:' à la place."
+
+#: lxc/action.go:34
+#, fuzzy
+msgid "The opposite of \"lxc pause\" is \"lxc start\"."
+msgstr "Le pendant de `lxc pause` est `lxc start`."
+
+#: lxc/network.go:262 lxc/network.go:311 lxc/storage.go:376 lxc/storage.go:476
+msgid "The specified device doesn't exist"
+msgstr "Le périphérique indiqué n'existe pas"
+
+#: lxc/network.go:266 lxc/network.go:315
+msgid "The specified device doesn't match the network"
+msgstr "le périphérique indiqué ne correspond pas au réseau"
+
+#: lxc/publish.go:65
+msgid "There is no \"image name\".  Did you want an alias?"
+msgstr "Il n'existe pas d'\"image\".  Vouliez-vous un alias ?"
+
+#: lxc/help.go:47
+msgid ""
+"This is the LXD command line client.\n"
 "\n"
-"lxc profile list [<remote>:]                                    Lister les "
-"profils disponibles.\n"
-"lxc profile show [<remote>:]<profile>                           Afficher les "
-"détails d'un profil.\n"
-"lxc profile create [<remote>:]<profile>                         Créer un "
-"profil.\n"
-"lxc profile copy [<remote>:]<profile> [<remote>:]<remote>       Copie le "
-"profil.\n"
-"lxc profile get [<remote>:]<profile> <key>                      Obtenir une "
-"clé de la configuration du profil.\n"
-"lxc profile set [<remote>:]<profile> <key> <value>              Positionner "
-"une clé de la configuration du profil.\n"
-"lxc profile unset [<remote>:]<profile> <key>                    Désaffecter "
-"une clé de la configuration du profil.\n"
-"lxc profile delete [<remote>:]<profile>                         Supprimer un "
-"profil.\n"
-"lxc profile edit [<remote>:]<profile>\n"
-"    Editer le profil, soit en lançant un éditeur externe ou en lisant "
-"STDIN.\n"
-"    Exemple : lxc profile edit <profile> # lancer l'éditeur\n"
-"              cat profile.yaml | lxc profile edit <profile> # lire depuis "
-"profile.yaml\n"
+"All of LXD's features can be driven through the various commands below.\n"
+"For help with any of those, simply call them with --help."
+msgstr ""
+
+#: lxc/action.go:45
+msgid "Time to wait for the container before killing it"
+msgstr "Temps d'attente du conteneur avant de le tuer"
+
+#: lxc/image.go:316
+msgid "Timestamps:"
+msgstr "Horodatage :"
+
+#: lxc/init.go:329
+msgid "To attach a network to a container, use: lxc network attach"
+msgstr "Pour attacher un réseau à un conteneur, utiliser : lxc network attach"
+
+#: lxc/init.go:328
+msgid "To create a new network, use: lxc network create"
+msgstr "Pour créer un réseau, utiliser : lxc network create"
+
+#: lxc/main.go:140
+msgid "To start your first container, try: lxc launch ubuntu:16.04"
+msgstr ""
+"Pour démarrer votre premier conteneur, essayer : lxc launch ubuntu:16.04"
+
+#: lxc/image.go:400
+#, c-format
+msgid "Transferring image: %s"
+msgstr "Transfert de l'image : %s"
+
+#: lxc/action.go:98 lxc/launch.go:159
+#, c-format
+msgid "Try `lxc info --show-log %s` for more info"
+msgstr "Essayer `lxc info --show-log %s` pour plus d'informations"
+
+#: lxc/info.go:102
+msgid "Type: ephemeral"
+msgstr "Type : éphémère"
+
+#: lxc/info.go:104
+msgid "Type: persistent"
+msgstr "Type : persistant"
+
+#: lxc/image.go:615
+msgid "UPLOAD DATE"
+msgstr "DATE DE PUBLICATION"
+
+#: lxc/remote.go:395
+msgid "URL"
+msgstr "URL"
+
+#: lxc/network.go:461 lxc/profile.go:500 lxc/storage.go:610 lxc/storage.go:688
+msgid "USED BY"
+msgstr "UTILISÉ PAR"
+
+#: lxc/manpage.go:36
+msgid "Unable to find help2man."
+msgstr ""
+
+#: lxc/remote.go:109
+msgid "Unable to read remote TLS certificate"
+msgstr "Impossible de lire le certificat TLS distant"
+
+#: lxc/image.go:321
+#, c-format
+msgid "Uploaded: %s"
+msgstr "Publié : %s"
+
+#: lxc/action.go:37
+#, fuzzy, c-format
+msgid ""
+"Usage: lxc %s [<remote>:]<container> [[<remote>:]<container>...]\n"
 "\n"
-"lxc profile assign [<remote>:]<container> <profiles>\n"
-"    Assigner une liste de profils séparés par des virgules à un\n"
-"    conteneur, dans l'ordre indiqué.  Tous les profils fournis dans\n"
-"    cet appel (et seulement ceux-ci) seront appliqués au conteneur\n"
-"    indiqué, i.e. cela positionne exactement la liste de profils à\n"
-"    ceux spécifiés dans la commande.  Pour ajouter ou supprimer un\n"
-"    profil en particulier d'un conteneur, utiliser {add|remove}\n"
-"    ci-dessous.\n"
-"    Exemple : lxc profile assign foo default,bar # Applique default et bar\n"
-"              lxc profile assign foo default # Seul default est actif\n"
-"              lxc profile assign '' # Plus aucun profil n'est appliqué\n"
-"              lxc profile assign bar,default # Applique default en second\n"
-"lxc profile add [<remote>:]<container> <profile> # Ajouter un profil à un "
-"conteneur\n"
-"lxc profile remove [<remote>:]<container> <profile> # Supprimer le profil "
-"d'un conteneur\n"
+"%s%s"
+msgstr ""
+"Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
-"Périphériques :\n"
-"lxc profile device list [<remote>:]<profile>                       Lister "
-"les périphériques d'un profil particulier.\n"
-"lxc profile device show [<remote>:]<profile>                       Afficher "
-"le détail des périphériques d'un profil donné.\n"
-"lxc profile device remove [<remote>:]<profile> <name>              Supprimer "
-"un périphérique d'un profil.\n"
-"lxc profile device get [<remote>:]<profile> <name> <key>           Obtenir "
-"la propriété d'un périphérique.\n"
-"lxc profile device set [<remote>:]<profile> <name> <key> <value>   "
-"Positionner la propriété d'un périphérique.\n"
-"lxc profile device unset [<remote>:]<profile> <name> <key>         "
-"Désaffecter la propriété d'un périphérique.\n"
-"lxc profile device add [<remote>:]<profile> <device> <type> [key=value]...\n"
-"    Ajouter un périphérique de profil, comme un disque ou une\n"
-"    interface réseau, aux conteneurs utilisant le profil indiqué."
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/help.go:45
+msgid "Usage: lxc <command> [options]"
+msgstr "Utilisation : lxc <commande> [options]"
 
 #: lxc/config.go:58
+#, fuzzy
 msgid ""
-"Manage configuration.\n"
-"\n"
-"lxc config device add [<remote>:]<container> <device> <type> "
-"[key=value...]   Add a device to a container.\n"
-"lxc config device get [<remote>:]<container> <device> "
-"<key>                   Get a device property.\n"
-"lxc config device set [<remote>:]<container> <device> <key> "
-"<value>           Set a device property.\n"
-"lxc config device unset [<remote>:]<container> <device> "
-"<key>                 Unset a device property.\n"
-"lxc config device list "
-"[<remote>:]<container>                                 List devices for "
-"container.\n"
-"lxc config device show "
-"[<remote>:]<container>                                 Show full device "
-"details for container.\n"
-"lxc config device remove [<remote>:]<container> "
-"<name>                        Remove device from container.\n"
-"\n"
-"lxc config get [<remote>:][container] "
-"<key>                                   Get container or server "
-"configuration key.\n"
-"lxc config set [<remote>:][container] <key> "
-"<value>                           Set container or server configuration "
-"key.\n"
-"lxc config unset [<remote>:][container] "
-"<key>                                 Unset container or server "
-"configuration key.\n"
-"lxc config show [<remote>:][container] [--"
-"expanded]                           Show container or server configuration.\n"
-"lxc config edit [<remote>:]"
-"[container]                                        Edit container or server "
-"configuration in external editor.\n"
+"Usage: lxc config <subcommand> [options]\n"
+"\n"
+"Change container or server configuration options.\n"
+"\n"
+"*Container configuration*\n"
+"\n"
+"lxc config get [<remote>:][container] <key>\n"
+"    Get container or server configuration key.\n"
+"\n"
+"lxc config set [<remote>:][container] <key> <value>\n"
+"    Set container or server configuration key.\n"
+"\n"
+"lxc config unset [<remote>:][container] <key>\n"
+"    Unset container or server configuration key.\n"
+"\n"
+"lxc config show [<remote>:][container] [--expanded]\n"
+"    Show container or server configuration.\n"
+"\n"
+"lxc config edit [<remote>:][container]\n"
 "    Edit configuration, either by launching external editor or reading "
 "STDIN.\n"
-"    Example: lxc config edit <container> # launch editor\n"
-"             cat config.yaml | lxc config edit <container> # read from "
-"config.yaml\n"
-"\n"
-"lxc config trust list "
-"[<remote>:]                                             List all trusted "
-"certs.\n"
-"lxc config trust add [<remote>:] <certfile."
-"crt>                               Add certfile.crt to trusted hosts.\n"
-"lxc config trust remove [<remote>:] [hostname|"
-"fingerprint]                    Remove the cert from trusted hosts.\n"
 "\n"
-"Examples:\n"
-"To mount host's /share/c1 onto /opt in the container:\n"
-"    lxc config device add [<remote>:]container1 <device-name> disk source=/"
-"share/c1 path=opt\n"
+"*Device management*\n"
 "\n"
-"To set an lxc config value:\n"
-"    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = "
-"1'\n"
+"lxc config device add [<remote>:]<container> <device> <type> [key=value...]\n"
+"    Add a device to a container.\n"
 "\n"
-"To listen on IPv4 and IPv6 port 8443 (you can omit the 8443 its the "
-"default):\n"
-"    lxc config set core.https_address [::]:8443\n"
+"lxc config device get [<remote>:]<container> <device> <key>\n"
+"    Get a device property.\n"
 "\n"
-"To set the server trust password:\n"
-"    lxc config set core.trust_password blah"
+"lxc config device set [<remote>:]<container> <device> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc config device unset [<remote>:]<container> <device> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc config device list [<remote>:]<container>\n"
+"    List devices for container.\n"
+"\n"
+"lxc config device show [<remote>:]<container>\n"
+"    Show full device details for container.\n"
+"\n"
+"lxc config device remove [<remote>:]<container> <name>\n"
+"    Remove device from container.\n"
+"\n"
+"*Client trust store management*\n"
+"\n"
+"lxc config trust list [<remote>:]\n"
+"    List all trusted certs.\n"
+"\n"
+"lxc config trust add [<remote>:] <certfile.crt>\n"
+"    Add certfile.crt to trusted hosts.\n"
+"\n"
+"lxc config trust remove [<remote>:] [hostname|fingerprint]\n"
+"    Remove the cert from trusted hosts.\n"
+"\n"
+"*Examples*\n"
+"\n"
+"cat config.yaml | lxc config edit <container>\n"
+"    Update the container configuration from config.yaml.\n"
+"\n"
+"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the container.\n"
+"\n"
+"lxc config set [<remote>:]<container> limits.cpu 2\n"
+"    Will set a CPU limit of \"2\" for the container.\n"
+"\n"
+"lxc config set core.https_address [::]:8443\n"
+"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"\n"
+"lxc config set core.trust_password blah\n"
+"    Will set the server's trust password to blah."
 msgstr ""
 "Gérer la configuration.\n"
 "\n"
@@ -1130,34 +1274,91 @@ msgstr ""
 "    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = "
 "1'\n"
 "\n"
-"Pour écouter sur le port 8443 en IPv4 et IPv6 (vous pouvez omettre 8443 "
-"c'est la valeur par défaut) :\n"
-"    lxc config set core.https_address [::]:8443\n"
+"Pour écouter sur le port 8443 en IPv4 et IPv6 (vous pouvez omettre 8443 "
+"c'est la valeur par défaut) :\n"
+"    lxc config set core.https_address [::]:8443\n"
+"\n"
+"Pour positionner le mot de passe de confiance du serveur :\n"
+"    lxc config set core.trust_password blah"
+
+#: lxc/copy.go:25
+#, fuzzy
+msgid ""
+"Usage: lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] "
+"[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]\n"
+"\n"
+"Copy containers within or in between LXD instances."
+msgstr ""
+"Copier les conteneurs dans ou depuis les instances LXD.\n"
+"\n"
+"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
+"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
+
+#: lxc/delete.go:26
+#, fuzzy
+msgid ""
+"Usage: lxc delete [<remote>:]<container>[/<snapshot>] "
+"[[<remote>:]<container>[/<snapshot>]...]\n"
+"\n"
+"Delete containers and snapshots."
+msgstr ""
+"Supprimer des conteneurs ou des instantanés.\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
+"(configuration, instantanés, …)."
+
+#: lxc/exec.go:46
+#, fuzzy
+msgid ""
+"Usage: lxc exec [<remote>:]<container> [--mode=auto|interactive|non-"
+"interactive] [--env KEY=VALUE...] [--] <command line>\n"
+"\n"
+"Execute commands in containers.\n"
+"\n"
+"Mode defaults to non-interactive, interactive mode is selected if both stdin "
+"AND stdout are terminals (stderr is ignored)."
+msgstr ""
+"Exécuter la commande indiquée dans un conteneur.\n"
+"\n"
+"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
+"env KEY=VALUE...] [--] <command line>\n"
 "\n"
-"Pour positionner le mot de passe de confiance du serveur :\n"
-"    lxc config set core.trust_password blah"
+"Le mode est non-interactif par défaut, le mode interactif est\n"
+"sélectionné si à la fois stdin et stdout sont des terminaux (stderr\n"
+"est ignoré)."
 
 #: lxc/file.go:36
 #, fuzzy
 msgid ""
-"Manage files in a container.\n"
+"Usage: lxc file <subcommand> [options]\n"
+"\n"
+"Manage files in containers.\n"
+"\n"
+"lxc file pull [-r|--recursive] [<remote>:]<container>/<path> "
+"[[<remote>:]<container>/<path>...] <target path>\n"
+"    Pull files from containers.\n"
 "\n"
-"lxc file pull [-r|--recursive] [<remote>:]<container> "
-"[[<remote>:]<container>...] <target path>\n"
 "lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
-"mode=MODE] <source path> [<source path>...] [<remote>:]<container>\n"
-"lxc file delete [<remote>:]<container> [[<remote>:]<container>...]\n"
-"lxc file edit [<remote>:]<container>/<path>\n"
+"mode=MODE] <source path> [<source path>...] [<remote>:]<container>/<path>\n"
+"    Push files into containers.\n"
 "\n"
-"<source> in the case of pull, <target> in the case of push and <file> in the "
-"case of edit are <container name>/<path>\n"
+"lxc file delete [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"<path>...]\n"
+"    Delete files in containers.\n"
 "\n"
-"Examples:\n"
-"To push /etc/hosts into the container foo:\n"
-"    lxc file push /etc/hosts foo/etc/hosts\n"
+"lxc file edit [<remote>:]<container>/<path>\n"
+"    Edit files in containers using the default text editor.\n"
+"\n"
+"*Examples*\n"
+"lxc file push /etc/hosts foo/etc/hosts\n"
+"   To push /etc/hosts into the container \"foo\".\n"
 "\n"
-"To pull /etc/hosts from the container:\n"
-"    lxc file pull foo/etc/hosts ."
+"lxc file pull foo/etc/hosts .\n"
+"   To pull /etc/hosts from the container and write it to the current "
+"directory."
 msgstr ""
 "Gérer les fichiers d'un conteneur.\n"
 "\n"
@@ -1178,178 +1379,25 @@ msgstr ""
 "Pour récupérer /etc/hosts du conteneur :\n"
 "  lxc file pull foo/etc/hosts ."
 
-#: lxc/network.go:49
-#, fuzzy
-msgid ""
-"Manage networks.\n"
-"\n"
-"lxc network list [<remote>:]                              List available "
-"networks.\n"
-"lxc network show [<remote>:]<network>                     Show details of a "
-"network.\n"
-"lxc network create [<remote>:]<network> [key=value...]    Create a network.\n"
-"lxc network get [<remote>:]<network> <key>                Get network "
-"configuration.\n"
-"lxc network set [<remote>:]<network> <key> <value>        Set network "
-"configuration.\n"
-"lxc network unset [<remote>:]<network> <key>              Unset network "
-"configuration.\n"
-"lxc network delete [<remote>:]<network>                   Delete a network.\n"
-"lxc network edit [<remote>:]<network>\n"
-"    Edit network, either by launching external editor or reading STDIN.\n"
-"    Example: lxc network edit <network> # launch editor\n"
-"             cat network.yaml | lxc network edit <network> # read from "
-"network.yaml\n"
-"\n"
-"lxc network attach [<remote>:]<network> <container> [device name] [interface "
-"name]\n"
-"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
-"[interface name]\n"
-"\n"
-"lxc network detach [<remote>:]<network> <container> [device name]\n"
-"lxc network detach-profile [<remote>:]<network> <container> [device name]"
-msgstr ""
-"Gérer les réseaux.\n"
-"\n"
-"lxc network list [<remote>:]                              Lister les réseaux "
-"disponibles.\n"
-"lxc network show [<remote>:]<network>                     Afficher les "
-"détails d'un réseau.\n"
-"lxc network create [<remote>:]<network> [key=value]...    Créer un réseau.\n"
-"lxc network get [<remote>:]<network> <key>                Récupérer une "
-"configuration du réseau.\n"
-"lxc network set [<remote>:]<network> <key> <value>        Positionner une "
-"configuration du réseau.\n"
-"lxc network unset [<remote>:]<network> <key>              Désaffecter une "
-"configuration du réseau.\n"
-"lxc network delete [<remote>:]<network>                   Supprimer un "
-"réseau.\n"
-"lxc network edit [<remote>:]<network>\n"
-"    Éditer le réseau, soit en lançant un éditeur externe ou en lisant "
-"STDIN.\n"
-"    Exemple : lxc network edit <network> # lancer l'éditeur\n"
-"              cat network.yaml | lxc network edit <network> # lire depuis "
-"network.yaml\n"
-"\n"
-"lxc network attach [<remote>:]<network> <container> [device name]\n"
-"lxc network attach-profile [<remote>:]<network> <profile> [device name]\n"
-"\n"
-"lxc network detach [<remote>:]<network> <container> [device name]\n"
-"lxc network detach-profile [<remote>:]<network> <container> [device name]"
-
-#: lxc/remote.go:37
+#: lxc/finger.go:15
 msgid ""
-"Manage remote LXD servers.\n"
+"Usage: lxc finger [<remote>:]\n"
 "\n"
-"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
-"password=PASSWORD]\n"
-"                                        [--public] [--protocol=PROTOCOL]    "
-"Add the remote <remote> at <url>.\n"
-"lxc remote remove <remote>                                                  "
-"Remove the remote <remote>.\n"
-"lxc remote list                                                             "
-"List all remotes.\n"
-"lxc remote rename <old name> <new name>                                     "
-"Rename remote <old name> to <new name>.\n"
-"lxc remote set-url <remote> <url>                                           "
-"Update <remote>'s url to <url>.\n"
-"lxc remote set-default <remote>                                             "
-"Set the default remote.\n"
-"lxc remote get-default                                                      "
-"Print the default remote."
+"Check if the LXD server is alive."
 msgstr ""
-"Gérer les serveur LXD distants.\n"
-"\n"
-"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
-"password=PASSWORD]\n"
-"                                      [--public] [--protocol=PROTOCOL]      "
-"Ajouter le serveur distant <name> accessible via <url>.\n"
-"lxc remote remove <remote>                                                  "
-"Supprimer le serveur distant <remote>.\n"
-"lxc remote list                                                             "
-"Lister tous les serveurs distants.\n"
-"lxc remote rename <old name> <new name>                                     "
-"Renommer le serveur distant de <old name> en <new name>.\n"
-"lxc remote set-url <remote> <url>                                           "
-"Mettre à jour l'url de <remote> en <url>.\n"
-"lxc remote set-default <remote>                                             "
-"Choisir le serveur distant par défaut.\n"
-"lxc remote get-default                                                      "
-"Afficher le serveur distant par défaut."
 
-#: lxc/storage.go:61
+#: lxc/help.go:22
 msgid ""
-"Manage storage.\n"
-"\n"
-"lxc storage list [<remote>:]                                    List "
-"available storage pools.\n"
-"lxc storage show [<remote>:]<pool>                              Show details "
-"of a storage pool.\n"
-"lxc storage create [<remote>:]<pool> <driver> [key=value]...    Create a "
-"storage pool.\n"
-"lxc storage get [<remote>:]<pool> <key>                         Get storage "
-"pool configuration.\n"
-"lxc storage set [<remote>:]<pool> <key> <value>                 Set storage "
-"pool configuration.\n"
-"lxc storage unset [<remote>:]<pool> <key>                       Unset "
-"storage pool configuration.\n"
-"lxc storage delete [<remote>:]<pool>                            Delete a "
-"storage pool.\n"
-"lxc storage edit [<remote>:]<pool>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage edit [<remote>:]<pool> # launch editor\n"
-"             cat pool.yaml | lxc storage edit [<remote>:]<pool> # read from "
-"pool.yaml\n"
-"\n"
-"lxc storage volume list [<remote>:]<pool>                              List "
-"available storage volumes on a storage pool.\n"
-"lxc storage volume show [<remote>:]<pool> <volume>                     Show "
-"details of a storage volume on a storage pool.\n"
-"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...    "
-"Create a storage volume on a storage pool.\n"
-"lxc storage volume get [<remote>:]<pool> <volume> <key>                Get "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>        Set "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume unset [<remote>:]<pool> <volume> <key>              Unset "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume delete [<remote>:]<pool> <volume>                   "
-"Delete a storage volume on a storage pool.\n"
-"lxc storage volume edit [<remote>:]<pool> <volume>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage volume edit [<remote>:]<pool> <volume> # launch "
-"editor\n"
-"             cat pool.yaml | lxc storage volume edit [<remote>:]<pool> "
-"<volume> # read from pool.yaml\n"
-"\n"
-"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
-"name] <path>\n"
-"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name] <path>\n"
-"\n"
-"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
-"name]\n"
-"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name]\n"
-"\n"
-"\n"
-"Unless specified through a prefix, all volume operations affect \"custom"
-"\" (user created) volumes.\n"
+"Usage: lxc help [--all]\n"
 "\n"
-"Examples:\n"
-"To show the properties of a custom volume called \"data\" in the \"default\" "
-"pool:\n"
-"    lxc storage volume show default data\n"
-"\n"
-"To show the properties of the filesystem for a container called \"data\" in "
-"the \"default\" pool:\n"
-"    lxc storage volume show default container/data\n"
+"Help page for the LXD client."
 msgstr ""
 
 #: lxc/image.go:62
+#, fuzzy
 msgid ""
+"Usage: lxc image <subcommand> [options]\n"
+"\n"
 "Manipulate container images.\n"
 "\n"
 "In LXD containers are created from images. Those images were themselves\n"
@@ -1478,55 +1526,262 @@ msgstr ""
 "    une partie de l'empreinte de l'image ou une partie de l'alias de\n"
 "    l'image.\n"
 "\n"
-"lxc image show [<remote>:]<image>\n"
-"    Sortie yaml des propriétés de l'image modifiables par l'utilisateur.\n"
+"lxc image show [<remote>:]<image>\n"
+"    Sortie yaml des propriétés de l'image modifiables par l'utilisateur.\n"
+"\n"
+"lxc image edit [<remote>:]<image>\n"
+"    Éditer l'image, soit en lançant un éditeur externe ou en lisant STDIN.\n"
+"    Exemple : lxc image edit <image> # lance l'éditeur\n"
+"              cat image.yaml | lxc image edit <image> # lit depuis image."
+"yaml\n"
+"\n"
+"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
+"    Créer un nouvel alias pour une image existante.\n"
+"\n"
+"lxc image alias delete [<remote>:]<alias>\n"
+"    Supprimer un alias.\n"
+"\n"
+"lxc image alias list [<remote>:] [<filter>]\n"
+"    Lister les alias.  Les filtres peuvent être une partie de l'empreinte\n"
+"    de l'image ou une partie de l'alias de l'image."
+
+#: lxc/info.go:25
+msgid ""
+"Usage: lxc info [<remote>:][<container>] [--show-log]\n"
+"\n"
+"Show container or server information.\n"
+"\n"
+"lxc info [<remote>:]<container> [--show-log]\n"
+"    For container information.\n"
+"\n"
+"lxc info [<remote>:]\n"
+"    For LXD server information."
+msgstr ""
+
+#: lxc/init.go:75
+#, fuzzy
+msgid ""
+"Usage: lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc init ubuntu:16.04 u1"
+msgstr ""
+"Initialiser un conteneur avec une image particulière.\n"
+"\n"
+"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
+"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>]\n"
+"\n"
+"Initialise un conteneur en utilisant l'image et le nom indiqués.\n"
+"\n"
+"Ne pas utiliser -p résultera en l'utilisation du profil par défaut.\n"
+"Utiliser \"-p\" sans argument résultera en aucun profil.\n"
+"\n"
+"Exemple :\n"
+"    lxc init ubuntu:16.04 u1"
+
+#: lxc/launch.go:23
+#, fuzzy
+msgid ""
+"Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create and start containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc launch ubuntu:16.04 u1"
+msgstr ""
+"Lancer le conteneur depuis une image particulière.\n"
+"\n"
+"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>]\n"
+"\n"
+"Lance un conteneur en utilisant l'image et le nom indiqués.\n"
+"\n"
+"Ne pas utiliser -p résultera en l'utilisation du profil par défaut.\n"
+"Utiliser \"-p\" sans argument résultera en aucun profil.\n"
+"\n"
+"Exemple :\n"
+"    lxc launch ubuntu:16.04 u1"
+
+#: lxc/list.go:47
+#, fuzzy
+msgid ""
+"Usage: lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] "
+"[--fast]\n"
+"\n"
+"List the existing containers.\n"
+"\n"
+"Default column layout: ns46tS\n"
+"Fast column layout: nsacPt\n"
+"\n"
+"*Filters*\n"
+"A single keyword like \"web\" which will list any container with a name "
+"starting by \"web\".\n"
+"\n"
+"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"\n"
+"A key/value pair referring to a configuration item. For those, the namespace "
+"can be abbreviated to the smallest unambiguous identifier.\n"
+"    - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"property set to \"abc\".\n"
+"\n"
+"    - \"u.blah=abc\" will do the same\n"
+"\n"
+"    - \"security.privileged=1\" will list all privileged containers\n"
+"\n"
+"    - \"s.privileged=1\" will do the same\n"
+"\n"
+"A regular expression matching a configuration item or its value. (e.g. "
+"volatile.eth0.hwaddr=00:16:3e:.*).\n"
+"\n"
+"*Columns*\n"
+"The -c option takes a comma separated list of arguments that control\n"
+"which container attributes to output when displaying in table format.\n"
+"\n"
+"Column arguments are either pre-defined shorthand chars (see below),\n"
+"or (extended) config keys.\n"
+"\n"
+"Commas between consecutive shorthand chars are optional.\n"
+"\n"
+"Pre-defined column shorthand chars:\n"
+"\n"
+"    4 - IPv4 address\n"
+"\n"
+"    6 - IPv6 address\n"
+"\n"
+"    a - Architecture\n"
+"\n"
+"    b - Storage pool\n"
+"\n"
+"    c - Creation date\n"
+"\n"
+"    l - Last used date\n"
+"\n"
+"    n - Name\n"
+"\n"
+"    p - PID of the container's init process\n"
+"\n"
+"    P - Profiles\n"
+"\n"
+"    s - State\n"
+"\n"
+"    S - Number of snapshots\n"
+"\n"
+"    t - Type (persistent or ephemeral)\n"
+"\n"
+"Custom columns are defined with \"key[:name][:maxWidth]\":\n"
+"\n"
+"    KEY: The (extended) config key to display\n"
+"\n"
+"    NAME: Name to display in the column header.\n"
+"    Defaults to the key if not specified or empty.\n"
+"\n"
+"    MAXWIDTH: Max width of the column (longer results are truncated).\n"
+"    Defaults to -1 (unlimited). Use 0 to limit to the column header size.\n"
+"\n"
+"*Examples*\n"
+"lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:"
+"MAC\n"
+"    Shows a list of containers using the \"NAME\", \"BASE IMAGE\", \"STATE"
+"\", \"IPV4\",\n"
+"    \"IPV6\" and \"MAC\" columns.\n"
+"\n"
+"    \"BASE IMAGE\" and \"MAC\" are custom columns generated from container "
+"configuration keys."
+msgstr ""
+"Lister les conteneurs.\n"
+"\n"
+"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
+"fast]\n"
+"\n"
+"Les filtres sont :\n"
+"* Un mot-clé unique comme \\web\\ qui listera tous les conteneurs dont le "
+"nom commence par \\web\\.\n"
+"* Une expression rationnelle sur le nom du conteneur (ex : *web.*01$)\n"
+"* Une paire de clé/valeur faisant référence à un élément de configuration.  "
+"Pour ceux-ci, l'espace de nom peut être abrégé au plus petit identifiant non "
+"ambigu :\n"
+" * \\user.blah=abc\\ listera tous les conteneurs dont la propriété "
+"utilisateur \\blah\\ est positionnée à \\abc\\.\n"
+" * \\u.blah=abc\\ fera la même chose\n"
+" * \\security.privileged=1\\ listera tous les conteneurs privilégiés\n"
+" * \\s.privileged=1\\ fera la même chose\n"
+"* Une expression rationelle correspondant à un élément de configuration ou à "
+"sa valeur (ex : volatile.eth0.hwaddr=00:16:3e:.*)\n"
+"\n"
+"L'option -c prend une liste d'arguments séparés par des virgules\n"
+"contrôlant les attributs des conteneurs à afficher au format tableau.\n"
+"Les arguments pour les colonnes sont soient des raccourcis par\n"
+"caractère prédéfinis (voir ci-dessous) ou des clés (étendues) de\n"
+"configuration.  Les virgules entre les caractères courts sont\n"
+"optionnelles.\n"
 "\n"
-"lxc image edit [<remote>:]<image>\n"
-"    Éditer l'image, soit en lançant un éditeur externe ou en lisant STDIN.\n"
-"    Exemple : lxc image edit <image> # lance l'éditeur\n"
-"              cat image.yaml | lxc image edit <image> # lit depuis image."
-"yaml\n"
+"Raccourcis par caractère prédéfinis :\n"
+"* 4 - adresse IPv4\n"
+"* 6 - adresse IPv6\n"
+"* a - architecture\n"
+"* c - date de création\n"
+"* l - date de dernière utilisation\n"
+"* n - nom\n"
+"* p - pid du processus init du conteneur\n"
+"* P - profils\n"
+"* s - état\n"
+"* S - nombre d'instantanés\n"
+"* t - type (persistant ou éphémère)\n"
 "\n"
-"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
-"    Créer un nouvel alias pour une image existante.\n"
+"Syntaxe des clés de configuration : clé[:nom][:largeurMax]\n"
+"* clé        - La clé (étendue) de configuration à afficher\n"
+"* nom        - Nom à afficher dans l'entête de colonne, c'est la clé\n"
+"               par défaut si rien n'est spécifié ou vide (pour\n"
+"               permettre la définition de largeurMax sans nom\n"
+"               personnalisé, ex : user.key::0)\n"
+"* largeurMax - Largeur max de la colonne (les résultats plus longs\n"
+"               seront tronqués).\n"
+"               -1 == pas de limite\n"
+"                0 == largeur de l'entête de colonne\n"
+"               >0 == largeur maximale en caractères\n"
+"               La valeur par défaut est -1 (pas de limite)\n"
 "\n"
-"lxc image alias delete [<remote>:]<alias>\n"
-"    Supprimer un alias.\n"
+"Colonnes par défaut : ns46tS\n"
+"Colonnes en mode rapide : nsacPt\n"
 "\n"
-"lxc image alias list [<remote>:] [<filter>]\n"
-"    Lister les alias.  Les filtres peuvent être une partie de l'empreinte\n"
-"    de l'image ou une partie de l'alias de l'image."
-
-#: lxc/info.go:161
-msgid "Memory (current)"
-msgstr "Mémoire (courante)"
-
-#: lxc/info.go:165
-msgid "Memory (peak)"
-msgstr "Mémoire (pointe)"
-
-#: lxc/info.go:177
-#, fuzzy
-msgid "Memory usage:"
-msgstr "  Mémoire utilisée :"
+"Exemple :\n"
+"    lxc list -c n,volatile.base_image:\\BASE IMAGE\\:0,s46,volatile.eth0."
+"hwaddr:MAC"
 
-#: lxc/help.go:87
-msgid "Missing summary."
-msgstr "Résumé manquant."
+#: lxc/manpage.go:20
+msgid ""
+"Usage: lxc manpage <directory>\n"
+"\n"
+"Generate all the LXD manpages."
+msgstr ""
 
 #: lxc/monitor.go:41
+#, fuzzy
 msgid ""
-"Monitor activity on the LXD server.\n"
+"Usage: lxc monitor [<remote>:] [--type=TYPE...]\n"
 "\n"
-"lxc monitor [<remote>:] [--type=TYPE...]\n"
+"Monitor a local or remote LXD server.\n"
 "\n"
-"Connects to the monitoring interface of the specified LXD server.\n"
+"By default the monitor will listen to all message types.\n"
 "\n"
-"By default will listen to all message types.\n"
-"Specific types to listen to can be specified with --type.\n"
+"Message types to listen for can be specified with --type.\n"
 "\n"
-"Example:\n"
-"    lxc monitor --type=logging"
+"*Examples*\n"
+"lxc monitor --type=logging\n"
+"    Only show log message."
 msgstr ""
 "Superviser l'activité du serveur LXD.\n"
 "\n"
@@ -1540,18 +1795,13 @@ msgstr ""
 "Exemple :\n"
 "lxc monitor --type=logging"
 
-#: lxc/network.go:224 lxc/network.go:273 lxc/storage.go:324 lxc/storage.go:424
-msgid "More than one device matches, specify the device name."
-msgstr "Plus d'un périphérique correspond, spécifier le nom du périphérique."
-
-#: lxc/file.go:274
-msgid "More than one file to download, but target is not a directory"
-msgstr ""
-"Plusieurs fichiers à télécharger, mais la destination n'est pas un dossier"
-
 #: lxc/move.go:16
+#, fuzzy
 msgid ""
-"Move containers within or in between lxd instances.\n"
+"Usage: lxc move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]]\n"
+"\n"
+"Move containers within or in between LXD instances.\n"
 "\n"
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
 "    Move a container between two hosts, renaming it if destination name "
@@ -1568,563 +1818,465 @@ msgstr ""
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
 "    Déplace un conteneur entre deux hôtes, en le renommant si le nom\n"
 "    de la destination diffère de l'original.\n"
-"\n"
-"lxc move <old name> <new name>\n"
-"    Renomme un conteneur local.\n"
-"\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
-"    Renomme un instantané."
-
-#: lxc/action.go:67
-msgid "Must supply container name for: "
-msgstr "Vous devez fournir le nom d'un conteneur pour : "
-
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
-#: lxc/storage.go:569 lxc/storage.go:649
-msgid "NAME"
-msgstr "NOM"
-
-#: lxc/network.go:420 lxc/remote.go:354 lxc/remote.go:359
-msgid "NO"
-msgstr "NON"
-
-#: lxc/info.go:89
-#, c-format
-msgid "Name: %s"
-msgstr "Nom : %s"
-
-#: lxc/network.go:198
-#, c-format
-msgid "Network %s created"
-msgstr "Le réseau %s a été créé"
-
-#: lxc/network.go:301
-#, c-format
-msgid "Network %s deleted"
-msgstr "Le réseau %s a été supprimé"
-
-#: lxc/init.go:143 lxc/init.go:144
-msgid "Network name"
-msgstr "Nom du réseau"
-
-#: lxc/info.go:194
-#, fuzzy
-msgid "Network usage:"
-msgstr "  Réseau utilisé :"
-
-#: lxc/image.go:134 lxc/publish.go:35
-msgid "New alias to define at target"
-msgstr "Nouvel alias à définir sur la cible"
-
-#: lxc/config.go:285
-msgid "No certificate provided to add"
-msgstr "Un certificat à ajouter n'a pas été fourni"
-
-#: lxc/network.go:233 lxc/network.go:282
-msgid "No device found for this network"
-msgstr "Aucun périphérique existant pour ce réseau"
-
-#: lxc/storage.go:333 lxc/storage.go:433
-#, fuzzy
-msgid "No device found for this storage volume."
-msgstr "Aucun périphérique existant pour ce réseau"
-
-#: lxc/config.go:308
-msgid "No fingerprint specified."
-msgstr "Aucune empreinte n'a été indiquée."
-
-#: lxc/storage.go:285 lxc/storage.go:369
-msgid "Only \"custom\" volumes can be attached to containers."
-msgstr "Seul les volumes \"custom\" peuvent être attaché aux conteneurs."
-
-#: lxc/remote.go:120
-msgid "Only https URLs are supported for simplestreams"
-msgstr "Seules les URLs https sont supportées par simplestreams"
-
-#: lxc/image.go:396
-msgid "Only https:// is supported for remote image import."
-msgstr "Seul https:// est supporté par l'import d'images distantes."
-
-#: lxc/network.go:330 lxc/network.go:457
-msgid "Only managed networks can be modified."
-msgstr "Seuls les réseaux gérés par LXD peuvent être modifiés."
-
-#: lxc/help.go:63 lxc/main.go:112
-msgid "Options:"
-msgstr "Options :"
-
-#: lxc/image.go:507
-#, c-format
-msgid "Output is in %s"
-msgstr "Le résultat est dans %s"
-
-#: lxc/exec.go:56
-msgid "Override the terminal mode (auto, interactive or non-interactive)"
-msgstr "Surcharger le mode terminal (auto, interactif ou non-interactif)"
-
-#: lxc/list.go:556
-msgid "PERSISTENT"
-msgstr "PERSISTANT"
-
-#: lxc/list.go:410
-msgid "PID"
-msgstr "PID"
-
-#: lxc/list.go:411
-msgid "PROFILES"
-msgstr "PROFILS"
-
-#: lxc/remote.go:382
-msgid "PROTOCOL"
-msgstr "PROTOCOLE"
-
-#: lxc/image.go:609 lxc/remote.go:383
-msgid "PUBLIC"
-msgstr "PUBLIC"
-
-#: lxc/info.go:188
-msgid "Packets received"
-msgstr "Paquets reçus"
-
-#: lxc/info.go:189
-msgid "Packets sent"
-msgstr "Paquets émis"
-
-#: lxc/help.go:70
-msgid "Path to an alternate client configuration directory"
-msgstr "Chemin vers un dossier de configuration client alternatif"
-
-#: lxc/help.go:71
-msgid "Path to an alternate server directory"
-msgstr "Chemin vers un dossier de configuration serveur alternatif"
-
-#: lxc/main.go:31
-msgid "Permission denied, are you in the lxd group?"
-msgstr "Permission refusée, êtes-vous dans le groupe lxd ?"
-
-#: lxc/info.go:106
-#, c-format
-msgid "Pid: %d"
-msgstr "Pid : %d"
-
-#: lxc/network.go:355 lxc/profile.go:219 lxc/storage.go:498 lxc/storage.go:803
-msgid "Press enter to open the editor again"
-msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
-
-#: lxc/config.go:536 lxc/config.go:601 lxc/image.go:704
-msgid "Press enter to start the editor again"
-msgstr "Appuyer sur Entrée pour lancer à nouveau l'éditeur"
-
-#: lxc/manpage.go:18
-msgid "Print all the subcommands help."
-msgstr "Afficher l'aide de toutes les commandes."
-
-#: lxc/help.go:65
-msgid "Print debug information"
-msgstr "Afficher les informations de débogage"
-
-#: lxc/help.go:64
-msgid "Print less common commands"
-msgstr "Afficher les commandes moins communes"
-
-#: lxc/help.go:66
-msgid "Print verbose information"
-msgstr "Afficher des informations supplémentaires"
-
-#: lxc/version.go:18
-msgid ""
-"Prints the version number of this client tool.\n"
-"\n"
-"lxc version"
-msgstr ""
-"Afficher le numéro de version de cet utilitaire client.\n"
-"\n"
-"lxc version"
-
-#: lxc/info.go:130
-#, c-format
-msgid "Processes: %d"
-msgstr "Processus : %d"
-
-#: lxc/profile.go:275
-#, c-format
-msgid "Profile %s added to %s"
-msgstr "Profil %s ajouté à %s"
-
-#: lxc/profile.go:170
-#, c-format
-msgid "Profile %s created"
-msgstr "Profil %s créé"
-
-#: lxc/profile.go:240
-#, c-format
-msgid "Profile %s deleted"
-msgstr "Profil %s supprimé"
-
-#: lxc/profile.go:306
-#, c-format
-msgid "Profile %s removed from %s"
-msgstr "Profil %s supprimé de %s"
-
-#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:139 lxc/init.go:140
-msgid "Profile to apply to the new container"
-msgstr "Profil à appliquer au nouveau conteneur"
-
-#: lxc/profile.go:256
-#, c-format
-msgid "Profiles %s applied to %s"
-msgstr "Profils %s appliqués à %s"
-
-#: lxc/info.go:104
-#, c-format
-msgid "Profiles: %s"
-msgstr "Profils : %s"
-
-#: lxc/image.go:330
-msgid "Properties:"
-msgstr "Propriétés :"
-
-#: lxc/remote.go:54
-msgid "Public image server"
-msgstr "Serveur d'images public"
-
-#: lxc/image.go:313
-#, c-format
-msgid "Public: %s"
-msgstr "Public : %s"
+"\n"
+"lxc move <old name> <new name>\n"
+"    Renomme un conteneur local.\n"
+"\n"
+"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"    Renomme un instantané."
 
-#: lxc/publish.go:27
+#: lxc/network.go:49
+#, fuzzy
 msgid ""
-"Publish containers as images.\n"
+"Usage: lxc network <subcommand> [options]\n"
 "\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
+"Manage and attach containers to networks.\n"
+"\n"
+"lxc network list [<remote>:]\n"
+"    List available networks.\n"
+"\n"
+"lxc network show [<remote>:]<network>\n"
+"    Show details of a network.\n"
+"\n"
+"lxc network create [<remote>:]<network> [key=value...]\n"
+"    Create a network.\n"
+"\n"
+"lxc network get [<remote>:]<network> <key>\n"
+"    Get network configuration.\n"
+"\n"
+"lxc network set [<remote>:]<network> <key> <value>\n"
+"    Set network configuration.\n"
+"\n"
+"lxc network unset [<remote>:]<network> <key>\n"
+"    Unset network configuration.\n"
+"\n"
+"lxc network delete [<remote>:]<network>\n"
+"    Delete a network.\n"
+"\n"
+"lxc network edit [<remote>:]<network>\n"
+"    Edit network, either by launching external editor or reading STDIN.\n"
+"\n"
+"lxc network attach [<remote>:]<network> <container> [device name] [interface "
+"name]\n"
+"    Attach a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
+"[interface name]\n"
+"    Attach a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"*Examples*\n"
+"cat network.yaml | lxc network edit <network>\n"
+"    Update a network using the content of network.yaml"
 msgstr ""
-"Publier des conteneurs en tant qu'images.\n"
+"Gérer les réseaux.\n"
 "\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
-
-#: lxc/file.go:58 lxc/file.go:59
-msgid "Recursively push or pull files"
-msgstr "Pousser ou récupérer des fichiers récursivement"
-
-#: lxc/remote.go:52
-msgid "Remote admin password"
-msgstr "Mot de passe de l'administrateur distant"
-
-#: lxc/info.go:91
-#, c-format
-msgid "Remote: %s"
-msgstr "Serveur distant : %s"
-
-#: lxc/delete.go:43
-#, c-format
-msgid "Remove %s (yes/no): "
-msgstr "Supprimer %s (oui/non) : "
-
-#: lxc/delete.go:37 lxc/delete.go:38
-msgid "Require user confirmation"
-msgstr "Requérir une confirmation de l'utilisateur"
-
-#: lxc/info.go:127
-msgid "Resources:"
-msgstr "Ressources :"
+"lxc network list [<remote>:]                              Lister les réseaux "
+"disponibles.\n"
+"lxc network show [<remote>:]<network>                     Afficher les "
+"détails d'un réseau.\n"
+"lxc network create [<remote>:]<network> [key=value]...    Créer un réseau.\n"
+"lxc network get [<remote>:]<network> <key>                Récupérer une "
+"configuration du réseau.\n"
+"lxc network set [<remote>:]<network> <key> <value>        Positionner une "
+"configuration du réseau.\n"
+"lxc network unset [<remote>:]<network> <key>              Désaffecter une "
+"configuration du réseau.\n"
+"lxc network delete [<remote>:]<network>                   Supprimer un "
+"réseau.\n"
+"lxc network edit [<remote>:]<network>\n"
+"    Éditer le réseau, soit en lançant un éditeur externe ou en lisant "
+"STDIN.\n"
+"    Exemple : lxc network edit <network> # lancer l'éditeur\n"
+"              cat network.yaml | lxc network edit <network> # lire depuis "
+"network.yaml\n"
+"\n"
+"lxc network attach [<remote>:]<network> <container> [device name]\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name]\n"
+"\n"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]"
 
-#: lxc/restore.go:21
+#: lxc/profile.go:49
+#, fuzzy
 msgid ""
-"Restore a container's state to a previous snapshot.\n"
+"Usage: lxc profile <subcommand> [options]\n"
 "\n"
-"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"Manage container configuration profiles.\n"
 "\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
+"*Profile configuration*\n"
+"lxc profile list [<remote>:]\n"
+"    List available profiles.\n"
 "\n"
-"Examples:\n"
-"Create the snapshot:\n"
-"    lxc snapshot u1 snap0\n"
+"lxc profile show [<remote>:]<profile>\n"
+"    Show details of a profile.\n"
 "\n"
-"Restore the snapshot:\n"
-"    lxc restore u1 snap0"
-msgstr ""
-"Restaurer l'état d'un conteneur depuis un instantané.\n"
+"lxc profile create [<remote>:]<profile>\n"
+"    Create a profile.\n"
 "\n"
-"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
+"    Copy the profile.\n"
 "\n"
-"Restaure un conteneur depuis un instantané (éventuellement avec l'état\n"
-"d'exécution, voir snapshot help pour les détails).\n"
+"lxc profile get [<remote>:]<profile> <key>\n"
+"    Get profile configuration.\n"
 "\n"
-"Par exemple :\n"
-"Créer un instantané :\n"
-"    lxc snapshot u1 snap0\n"
+"lxc profile set [<remote>:]<profile> <key> <value>\n"
+"    Set profile configuration.\n"
 "\n"
-"Restaurer un instantané :\n"
-"    lxc restore u1 snap0"
-
-#: lxc/init.go:256
-#, c-format
-msgid "Retrieving image: %s"
-msgstr "Récupération de l'image : %s"
-
-#: lxc/image.go:612
-msgid "SIZE"
-msgstr "TAILLE"
-
-#: lxc/list.go:412
-msgid "SNAPSHOTS"
-msgstr "INSTANTANÉS"
-
-#: lxc/storage.go:571
-msgid "SOURCE"
-msgstr "SOURCE"
-
-#: lxc/list.go:413
-msgid "STATE"
-msgstr "ÉTAT"
-
-#: lxc/remote.go:384
-msgid "STATIC"
-msgstr "STATIQUE"
-
-#: lxc/list.go:415
-msgid "STORAGE POOL"
-msgstr ""
-
-#: lxc/remote.go:225
-msgid "Server certificate NACKed by user"
-msgstr "Certificat serveur rejeté par l'utilisateur"
-
-#: lxc/remote.go:287
-msgid "Server doesn't trust us after adding our cert"
+"lxc profile unset [<remote>:]<profile> <key>\n"
+"    Unset profile configuration.\n"
+"\n"
+"lxc profile delete [<remote>:]<profile>\n"
+"    Delete a profile.\n"
+"\n"
+"lxc profile edit [<remote>:]<profile>\n"
+"    Edit profile, either by launching external editor or reading STDIN.\n"
+"\n"
+"*Profile assignment*\n"
+"lxc profile assign [<remote>:]<container> <profiles>\n"
+"    Replace the current set of profiles for the container by the one "
+"provided.\n"
+"\n"
+"lxc profile add [<remote>:]<container> <profile>\n"
+"    Add a profile to a container\n"
+"\n"
+"lxc profile remove [<remote>:]<container> <profile>\n"
+"    Remove the profile from a container\n"
+"\n"
+"*Device management*\n"
+"lxc profile device list [<remote>:]<profile>\n"
+"    List devices in the given profile.\n"
+"\n"
+"lxc profile device show [<remote>:]<profile>\n"
+"    Show full device details in the given profile.\n"
+"\n"
+"lxc profile device remove [<remote>:]<profile> <name>\n"
+"    Remove a device from a profile.\n"
+"\n"
+"lxc profile device get [<remote>:]<profile> <name> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc profile device unset [<remote>:]<profile> <name> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
+"    Add a profile device, such as a disk or a nic, to the containers using "
+"the specified profile.\n"
+"\n"
+"*Examples*\n"
+"cat profile.yaml | lxc profile edit <profile>\n"
+"    Update a profile using the content of profile.yaml\n"
+"\n"
+"lxc profile assign foo default,bar\n"
+"    Set the profiles for \"foo\" to \"default\" and \"bar\".\n"
+"\n"
+"lxc profile assign foo default\n"
+"    Reset \"foo\" to only using the \"default\" profile.\n"
+"\n"
+"lxc profile assign foo ''\n"
+"    Remove all profile from \"foo\""
 msgstr ""
-"Le serveur ne nous fait pas confiance après l'ajout de notre certificat"
-
-#: lxc/remote.go:53
-msgid "Server protocol (lxd or simplestreams)"
-msgstr "Protocole du serveur (lxd ou simplestreams)"
-
-#: lxc/file.go:56
-msgid "Set the file's gid on push"
-msgstr "Définir le gid du fichier lors de l'envoi"
-
-#: lxc/file.go:57
-msgid "Set the file's perms on push"
-msgstr "Définir les permissions du fichier lors de l'envoi"
-
-#: lxc/file.go:55
-msgid "Set the file's uid on push"
-msgstr "Définir l'uid du fichier lors de l'envoi"
-
-#: lxc/help.go:32
-msgid "Show all commands (not just interesting ones)"
-msgstr "Afficher toutes les comandes (pas seulement les plus intéressantes)"
-
-#: lxc/help.go:67
-msgid "Show client version"
-msgstr "Afficher la version du client"
-
-#: lxc/info.go:36
-msgid "Show the container's last 100 log lines?"
-msgstr "Afficher les 100 dernières lignes du journal du conteneur ?"
-
-#: lxc/config.go:33
-msgid "Show the expanded configuration"
-msgstr "Afficher la configuration étendue"
-
-#: lxc/image.go:311
-#, c-format
-msgid "Size: %.2fMB"
-msgstr "Taille : %.2f Mo"
-
-#: lxc/info.go:208
-msgid "Snapshots:"
-msgstr "Instantanés :"
-
-#: lxc/action.go:133
-#, fuzzy, c-format
-msgid "Some containers failed to %s"
-msgstr "L'arrêt du conteneur a échoué !"
-
-#: lxc/image.go:340
-msgid "Source:"
-msgstr "Source :"
-
-#: lxc/launch.go:148
-#, c-format
-msgid "Starting %s"
-msgstr "Démarrage de %s"
-
-#: lxc/info.go:98
-#, c-format
-msgid "Status: %s"
-msgstr "État : %s"
-
-#: lxc/publish.go:36 lxc/publish.go:37
-msgid "Stop the container if currently running"
-msgstr "Arrêter le conteneur s'il est en cours d'exécution"
-
-#: lxc/delete.go:107 lxc/publish.go:114
-msgid "Stopping container failed!"
-msgstr "L'arrêt du conteneur a échoué !"
-
-#: lxc/storage.go:398
-#, fuzzy, c-format
-msgid "Storage pool %s created"
-msgstr "Le réseau %s a été créé"
-
-#: lxc/storage.go:448
-#, fuzzy, c-format
-msgid "Storage pool %s deleted"
-msgstr "Le réseau %s a été supprimé"
+"Gérer les profils de configuration.\n"
+"\n"
+"lxc profile list [<remote>:]                                    Lister les "
+"profils disponibles.\n"
+"lxc profile show [<remote>:]<profile>                           Afficher les "
+"détails d'un profil.\n"
+"lxc profile create [<remote>:]<profile>                         Créer un "
+"profil.\n"
+"lxc profile copy [<remote>:]<profile> [<remote>:]<remote>       Copie le "
+"profil.\n"
+"lxc profile get [<remote>:]<profile> <key>                      Obtenir une "
+"clé de la configuration du profil.\n"
+"lxc profile set [<remote>:]<profile> <key> <value>              Positionner "
+"une clé de la configuration du profil.\n"
+"lxc profile unset [<remote>:]<profile> <key>                    Désaffecter "
+"une clé de la configuration du profil.\n"
+"lxc profile delete [<remote>:]<profile>                         Supprimer un "
+"profil.\n"
+"lxc profile edit [<remote>:]<profile>\n"
+"    Editer le profil, soit en lançant un éditeur externe ou en lisant "
+"STDIN.\n"
+"    Exemple : lxc profile edit <profile> # lancer l'éditeur\n"
+"              cat profile.yaml | lxc profile edit <profile> # lire depuis "
+"profile.yaml\n"
+"\n"
+"lxc profile assign [<remote>:]<container> <profiles>\n"
+"    Assigner une liste de profils séparés par des virgules à un\n"
+"    conteneur, dans l'ordre indiqué.  Tous les profils fournis dans\n"
+"    cet appel (et seulement ceux-ci) seront appliqués au conteneur\n"
+"    indiqué, i.e. cela positionne exactement la liste de profils à\n"
+"    ceux spécifiés dans la commande.  Pour ajouter ou supprimer un\n"
+"    profil en particulier d'un conteneur, utiliser {add|remove}\n"
+"    ci-dessous.\n"
+"    Exemple : lxc profile assign foo default,bar # Applique default et bar\n"
+"              lxc profile assign foo default # Seul default est actif\n"
+"              lxc profile assign '' # Plus aucun profil n'est appliqué\n"
+"              lxc profile assign bar,default # Applique default en second\n"
+"lxc profile add [<remote>:]<container> <profile> # Ajouter un profil à un "
+"conteneur\n"
+"lxc profile remove [<remote>:]<container> <profile> # Supprimer le profil "
+"d'un conteneur\n"
+"\n"
+"Périphériques :\n"
+"lxc profile device list [<remote>:]<profile>                       Lister "
+"les périphériques d'un profil particulier.\n"
+"lxc profile device show [<remote>:]<profile>                       Afficher "
+"le détail des périphériques d'un profil donné.\n"
+"lxc profile device remove [<remote>:]<profile> <name>              Supprimer "
+"un périphérique d'un profil.\n"
+"lxc profile device get [<remote>:]<profile> <name> <key>           Obtenir "
+"la propriété d'un périphérique.\n"
+"lxc profile device set [<remote>:]<profile> <name> <key> <value>   "
+"Positionner la propriété d'un périphérique.\n"
+"lxc profile device unset [<remote>:]<profile> <name> <key>         "
+"Désaffecter la propriété d'un périphérique.\n"
+"lxc profile device add [<remote>:]<profile> <device> <type> [key=value]...\n"
+"    Ajouter un périphérique de profil, comme un disque ou une\n"
+"    interface réseau, aux conteneurs utilisant le profil indiqué."
 
-#: lxc/init.go:145 lxc/init.go:146
-msgid "Storage pool name"
+#: lxc/publish.go:27
+#, fuzzy
+msgid ""
+"Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]\n"
+"\n"
+"Publish containers as images."
 msgstr ""
+"Publier des conteneurs en tant qu'images.\n"
+"\n"
+"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]"
 
-#: lxc/storage.go:672
-#, fuzzy, c-format
-msgid "Storage volume %s created"
-msgstr "Profil %s créé"
-
-#: lxc/storage.go:682
-#, fuzzy, c-format
-msgid "Storage volume %s deleted"
-msgstr "Profil %s supprimé"
-
-#: lxc/action.go:48
-msgid "Store the container state (only for stop)"
-msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
-
-#: lxc/info.go:169
-msgid "Swap (current)"
-msgstr "Swap (courant)"
-
-#: lxc/info.go:173
-msgid "Swap (peak)"
-msgstr "Swap (pointe)"
-
-#: lxc/list.go:414 lxc/network.go:435 lxc/storage.go:648
-msgid "TYPE"
-msgstr "TYPE"
-
-#: lxc/delete.go:93
-msgid "The container is currently running, stop it first or pass --force."
+#: lxc/remote.go:37
+#, fuzzy
+msgid ""
+"Usage: lxc remote <subcommand> [options]\n"
+"\n"
+"Manage the list of remote LXD servers.\n"
+"\n"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
+"password=PASSWORD] [--public] [--protocol=PROTOCOL]\n"
+"    Add the remote <remote> at <url>.\n"
+"\n"
+"lxc remote remove <remote>\n"
+"    Remove the remote <remote>.\n"
+"\n"
+"lxc remote list\n"
+"    List all remotes.\n"
+"\n"
+"lxc remote rename <old name> <new name>\n"
+"    Rename remote <old name> to <new name>.\n"
+"\n"
+"lxc remote set-url <remote> <url>\n"
+"    Update <remote>'s url to <url>.\n"
+"\n"
+"lxc remote set-default <remote>\n"
+"    Set the default remote.\n"
+"\n"
+"lxc remote get-default\n"
+"    Print the default remote."
 msgstr ""
-"Le conteneur est en cours d'exécution, l'arrêter d'abord ou ajouter --force."
+"Gérer les serveur LXD distants.\n"
+"\n"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
+"password=PASSWORD]\n"
+"                                      [--public] [--protocol=PROTOCOL]      "
+"Ajouter le serveur distant <name> accessible via <url>.\n"
+"lxc remote remove <remote>                                                  "
+"Supprimer le serveur distant <remote>.\n"
+"lxc remote list                                                             "
+"Lister tous les serveurs distants.\n"
+"lxc remote rename <old name> <new name>                                     "
+"Renommer le serveur distant de <old name> en <new name>.\n"
+"lxc remote set-url <remote> <url>                                           "
+"Mettre à jour l'url de <remote> en <url>.\n"
+"lxc remote set-default <remote>                                             "
+"Choisir le serveur distant par défaut.\n"
+"lxc remote get-default                                                      "
+"Afficher le serveur distant par défaut."
 
-#: lxc/publish.go:92
+#: lxc/restore.go:21
+#, fuzzy
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
-"restarted."
+"Usage: lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"\n"
+"Restore containers from snapshots.\n"
+"\n"
+"If --stateful is passed, then the running state will be restored too.\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create the snapshot.\n"
+"\n"
+"lxc restore u1 snap0\n"
+"    Restore the snapshot."
 msgstr ""
-"Le conteneur est en cours d'exécution. Utiliser --force pour qu'il soit "
-"arrêté et redémarré."
+"Restaurer l'état d'un conteneur depuis un instantané.\n"
+"\n"
+"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"\n"
+"Restaure un conteneur depuis un instantané (éventuellement avec l'état\n"
+"d'exécution, voir snapshot help pour les détails).\n"
+"\n"
+"Par exemple :\n"
+"Créer un instantané :\n"
+"    lxc snapshot u1 snap0\n"
+"\n"
+"Restaurer un instantané :\n"
+"    lxc restore u1 snap0"
 
-#: lxc/init.go:329
-msgid "The container you are starting doesn't have any network attached to it."
+#: lxc/snapshot.go:21
+#, fuzzy
+msgid ""
+"Usage: lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"Create container snapshots.\n"
+"\n"
+"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"running state, including process memory state, TCP connections, ...\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create a snapshot of \"u1\" called \"snap0\"."
 msgstr ""
-"Le conteneur que vous démarrez n'est attaché à aucune interface réseau."
-
-#: lxc/config.go:680 lxc/config.go:692 lxc/config.go:725 lxc/config.go:743
-#: lxc/config.go:781 lxc/config.go:799
-msgid "The device doesn't exist"
-msgstr "Le périphérique n'existe pas"
-
-#: lxc/init.go:313
-#, c-format
-msgid "The local image '%s' couldn't be found, trying '%s:' instead."
-msgstr "L'image locale '%s' n'a pas été trouvée, essayer '%s:' à la place."
-
-#: lxc/main.go:181
-msgid "The opposite of `lxc pause` is `lxc start`."
-msgstr "Le pendant de `lxc pause` est `lxc start`."
-
-#: lxc/network.go:238 lxc/network.go:287 lxc/storage.go:338 lxc/storage.go:438
-msgid "The specified device doesn't exist"
-msgstr "Le périphérique indiqué n'existe pas"
-
-#: lxc/network.go:242 lxc/network.go:291
-msgid "The specified device doesn't match the network"
-msgstr "le périphérique indiqué ne correspond pas au réseau"
-
-#: lxc/publish.go:65
-msgid "There is no \"image name\".  Did you want an alias?"
-msgstr "Il n'existe pas d'\"image\".  Vouliez-vous un alias ?"
-
-#: lxc/action.go:44
-msgid "Time to wait for the container before killing it"
-msgstr "Temps d'attente du conteneur avant de le tuer"
-
-#: lxc/image.go:314
-msgid "Timestamps:"
-msgstr "Horodatage :"
-
-#: lxc/init.go:331
-msgid "To attach a network to a container, use: lxc network attach"
-msgstr "Pour attacher un réseau à un conteneur, utiliser : lxc network attach"
-
-#: lxc/init.go:330
-msgid "To create a new network, use: lxc network create"
-msgstr "Pour créer un réseau, utiliser : lxc network create"
+"Créer un instantané en lecture seule d'un conteneur.\n"
+"\n"
+"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"Crée un instantanté du conteneur (y compris — de manière optionnelle —\n"
+"l'état de la mémoire du conteneur).  Si --stateful est utilisé, LXD\n"
+"tente de créer un point d'arrêt de l'état d'exécution du conteneur,\n"
+"incluant l'état de la mémoire, les connexions TCP, etc. afin qu'il\n"
+"puisse être restauré (via lxc restore) ultérieurement (bien que\n"
+"certaines choses, les connexions TCP ayant expirées après que la\n"
+"fenêtre de temps se soit écoulée par exemple, ne puissent être\n"
+"restaurées avec succès).\n"
+"\n"
+"Exemple :\n"
+"    lxc snapshot u1 snap0"
 
-#: lxc/main.go:137
-msgid "To start your first container, try: lxc launch ubuntu:16.04"
+#: lxc/storage.go:61
+msgid ""
+"Usage: lxc storage <subcommand> [options]\n"
+"\n"
+"Manage storage pools and volumes.\n"
+"\n"
+"*Storage pools*\n"
+"lxc storage list [<remote>:]\n"
+"    List available storage pools.\n"
+"\n"
+"lxc storage show [<remote>:]<pool>\n"
+"    Show details of a storage pool.\n"
+"\n"
+"lxc storage create [<remote>:]<pool> <driver> [key=value]...\n"
+"    Create a storage pool.\n"
+"\n"
+"lxc storage get [<remote>:]<pool> <key>\n"
+"    Get storage pool configuration.\n"
+"\n"
+"lxc storage set [<remote>:]<pool> <key> <value>\n"
+"    Set storage pool configuration.\n"
+"\n"
+"lxc storage unset [<remote>:]<pool> <key>\n"
+"    Unset storage pool configuration.\n"
+"\n"
+"lxc storage delete [<remote>:]<pool>\n"
+"    Delete a storage pool.\n"
+"\n"
+"lxc storage edit [<remote>:]<pool>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Storage volumes*\n"
+"lxc storage volume list [<remote>:]<pool>\n"
+"    List available storage volumes on a storage pool.\n"
+"\n"
+"lxc storage volume show [<remote>:]<pool> <volume>\n"
+"    Show details of a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...\n"
+"    Create a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume get [<remote>:]<pool> <volume> <key>\n"
+"    Get storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>\n"
+"    Set storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume unset [<remote>:]<pool> <volume> <key>\n"
+"    Unset storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume delete [<remote>:]<pool> <volume>\n"
+"    Delete a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
+"name] <path>\n"
+"    Attach a storage volume to the specified container.\n"
+"\n"
+"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name] <path>\n"
+"    Attach a storage volume to the specified profile.\n"
+"\n"
+"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
+"name]\n"
+"    Detach a storage volume from the specified container.\n"
+"\n"
+"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name]\n"
+"    Detach a storage volume from the specified profile.\n"
+"\n"
+"Unless specified through a prefix, all volume operations affect \"custom"
+"\" (user created) volumes.\n"
+"\n"
+"*Examples*\n"
+"cat pool.yaml | lxc storage edit [<remote>:]<pool>\n"
+"    Update a storage pool using the content of pool.yaml.\n"
+"\n"
+"cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Update a storage volume using the content of pool.yaml.\n"
+"\n"
+"lxc storage volume show default data\n"
+"    Will show the properties of a custom volume called \"data\" in the "
+"\"default\" pool.\n"
+"\n"
+"lxc storage volume show default container/data\n"
+"    Will show the properties of the filesystem for a container called \"data"
+"\" in the \"default\" pool."
 msgstr ""
-"Pour démarrer votre premier conteneur, essayer : lxc launch ubuntu:16.04"
-
-#: lxc/image.go:398
-#, c-format
-msgid "Transferring image: %s"
-msgstr "Transfert de l'image : %s"
-
-#: lxc/action.go:97 lxc/launch.go:161
-#, c-format
-msgid "Try `lxc info --show-log %s` for more info"
-msgstr "Essayer `lxc info --show-log %s` pour plus d'informations"
-
-#: lxc/info.go:100
-msgid "Type: ephemeral"
-msgstr "Type : éphémère"
-
-#: lxc/info.go:102
-msgid "Type: persistent"
-msgstr "Type : persistant"
-
-#: lxc/image.go:613
-msgid "UPLOAD DATE"
-msgstr "DATE DE PUBLICATION"
 
-#: lxc/remote.go:381
-msgid "URL"
-msgstr "URL"
-
-#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
-msgid "USED BY"
-msgstr "UTILISÉ PAR"
-
-#: lxc/remote.go:95
-msgid "Unable to read remote TLS certificate"
-msgstr "Impossible de lire le certificat TLS distant"
-
-#: lxc/image.go:319
-#, c-format
-msgid "Uploaded: %s"
-msgstr "Publié : %s"
-
-#: lxc/main.go:112
-#, c-format
-msgid "Usage: %s"
-msgstr "Utilisation : %s"
-
-#: lxc/help.go:48
-msgid "Usage: lxc <command> [options]"
-msgstr "Utilisation : lxc <commande> [options]"
+#: lxc/version.go:18
+#, fuzzy
+msgid ""
+"Usage: lxc version\n"
+"\n"
+"Print the version number of this client tool."
+msgstr ""
+"Afficher le numéro de version de cet utilitaire client.\n"
+"\n"
+"lxc version"
 
-#: lxc/delete.go:47
+#: lxc/delete.go:45
 msgid "User aborted delete operation."
 msgstr "L'utilisateur a annulé l'opération de suppression."
 
-#: lxc/restore.go:38
+#: lxc/restore.go:37
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
 "available)"
@@ -2132,25 +2284,25 @@ msgstr ""
 "Restaurer ou pas l'état de fonctionnement du conteneur depuis l'instantané "
 "(s'il est disponible)"
 
-#: lxc/snapshot.go:38
+#: lxc/snapshot.go:35
 msgid "Whether or not to snapshot the container's running state"
 msgstr "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
 
-#: lxc/network.go:422 lxc/remote.go:356 lxc/remote.go:361
+#: lxc/network.go:446 lxc/remote.go:370 lxc/remote.go:375
 msgid "YES"
 msgstr "OUI"
 
-#: lxc/main.go:52
+#: lxc/main.go:55
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 "La commande `lxc config profile` est dépréciée, merci d'utiliser `lxc "
 "profile`"
 
-#: lxc/launch.go:132
+#: lxc/launch.go:130
 msgid "bad number of things scanned from image, container or snapshot"
 msgstr "mauvais nombre d'éléments dans l'image, conteneur ou instantané"
 
-#: lxc/action.go:93
+#: lxc/action.go:94
 msgid "bad result type from action"
 msgstr "mauvais type de réponse renvoyé par l'action !"
 
@@ -2158,50 +2310,50 @@ msgstr "mauvais type de réponse renvoyé par l'action !"
 msgid "can't copy to the same container name"
 msgstr "impossible de copier vers le même nom de conteneur"
 
-#: lxc/file.go:309
+#: lxc/file.go:316
 msgid "can't pull a directory without --recursive"
 msgstr "impossible de récupérer un répertoire sans --recursive"
 
-#: lxc/remote.go:344
+#: lxc/remote.go:358
 msgid "can't remove the default remote"
 msgstr "impossible de supprimer le serveur distant par défaut"
 
-#: lxc/file.go:120
+#: lxc/file.go:127
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr "impossible de spécifier uid/gid/mode en mode récursif"
 
-#: lxc/remote.go:370
+#: lxc/remote.go:384
 msgid "default"
 msgstr "par défaut"
 
 #: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
-#: lxc/init.go:236 lxc/init.go:241 lxc/launch.go:116 lxc/launch.go:121
+#: lxc/init.go:234 lxc/init.go:239 lxc/launch.go:114 lxc/launch.go:119
 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:305
+#: lxc/image.go:307
 msgid "disabled"
 msgstr "désactivé"
 
-#: lxc/image.go:307
+#: lxc/image.go:309
 msgid "enabled"
 msgstr "activé"
 
-#: lxc/action.go:125 lxc/main.go:22 lxc/main.go:148
+#: lxc/action.go:126 lxc/main.go:25 lxc/main.go:159
 #, c-format
 msgid "error: %v"
 msgstr "erreur : %v"
 
-#: lxc/help.go:40 lxc/main.go:107
+#: lxc/help.go:37 lxc/main.go:106
 #, c-format
 msgid "error: unknown command: %s"
 msgstr "erreur : commande inconnue: %s"
 
-#: lxc/launch.go:136
+#: lxc/launch.go:134
 msgid "got bad version"
 msgstr "reçu une mauvaise version"
 
-#: lxc/image.go:300 lxc/image.go:589
+#: lxc/image.go:302 lxc/image.go:591
 msgid "no"
 msgstr "non"
 
@@ -2209,48 +2361,48 @@ msgstr "non"
 msgid "not all the profiles from the source exist on the target"
 msgstr "tous les profils de la source n'existent pas sur la cible"
 
-#: lxc/remote.go:218
+#: lxc/remote.go:232
 msgid "ok (y/n)?"
 msgstr "ok (y/n) ?"
 
-#: lxc/main.go:305 lxc/main.go:309
+#: lxc/main.go:331 lxc/main.go:335
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr "l'analyse des alias a échoué %s\n"
 
-#: lxc/file.go:376
+#: lxc/file.go:383
 msgid "recursive edit doesn't make sense :("
 msgstr "l'édition récursive ne fait aucun sens :("
 
-#: lxc/remote.go:406
+#: lxc/remote.go:420
 #, c-format
 msgid "remote %s already exists"
 msgstr "le serveur distant %s existe déjà"
 
-#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
+#: lxc/remote.go:350 lxc/remote.go:412 lxc/remote.go:447 lxc/remote.go:463
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "le serveur distant %s n'existe pas"
 
-#: lxc/remote.go:319
+#: lxc/remote.go:333
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "le serveur distant %s existe en tant que <%s>"
 
-#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
+#: lxc/remote.go:354 lxc/remote.go:416 lxc/remote.go:451
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr "le serveur distant %s est statique et ne peut être modifié"
 
-#: lxc/info.go:219
+#: lxc/info.go:221
 msgid "stateful"
 msgstr "à suivi d'état"
 
-#: lxc/info.go:221
+#: lxc/info.go:223
 msgid "stateless"
 msgstr "sans suivi d'état"
 
-#: lxc/info.go:215
+#: lxc/info.go:217
 #, c-format
 msgid "taken at %s"
 msgstr "pris à %s"
@@ -2259,14 +2411,58 @@ msgstr "pris à %s"
 msgid "unreachable return reached"
 msgstr "Un retour impossible à été renvoyé"
 
-#: lxc/main.go:237
+#: lxc/main.go:262
 msgid "wrong number of subcommand arguments"
 msgstr "nombre d'arguments incorrect pour la sous-comande"
 
-#: lxc/delete.go:46 lxc/image.go:302 lxc/image.go:593
+#: lxc/delete.go:44 lxc/image.go:304 lxc/image.go:595
 msgid "yes"
 msgstr "oui"
 
 #: lxc/copy.go:45
 msgid "you must specify a source container name"
 msgstr "vous devez spécifier un nom de conteneur source"
+
+#~ msgid "Available commands:"
+#~ msgstr "Commandes disponibles :"
+
+#~ msgid ""
+#~ "Check if the LXD instance is up.\n"
+#~ "\n"
+#~ "lxc finger [<remote>:]"
+#~ msgstr ""
+#~ "Vérifier si l'instance LXD est active.\n"
+#~ "\n"
+#~ "lxc finger [<remote>:]"
+
+#~ msgid ""
+#~ "Help page for the LXD client.\n"
+#~ "\n"
+#~ "lxc help [--all]"
+#~ msgstr ""
+#~ "Page d'aide du client LXD.\n"
+#~ "\n"
+#~ "lxc help [--all]"
+
+#~ msgid ""
+#~ "List information on LXD servers and containers.\n"
+#~ "\n"
+#~ "For a container:\n"
+#~ "    lxc info [<remote:>]<container> [--show-log]\n"
+#~ "\n"
+#~ "For a server:\n"
+#~ "    lxc info [<remote:>]"
+#~ msgstr ""
+#~ "Lister les informations concernant les serveurs LXD et les conteneurs.\n"
+#~ "\n"
+#~ "Pour un conteneur :\n"
+#~ "    lxc info [<remote>:]<container> [--show-log]\n"
+#~ "\n"
+#~ "Pour un serveur :\n"
+#~ "    lxc info [<remote>:]"
+
+#~ msgid "Print all the subcommands help."
+#~ msgstr "Afficher l'aide de toutes les commandes."
+
+#~ msgid "Usage: %s"
+#~ msgstr "Utilisation : %s"
diff --git a/po/ja.po b/po/ja.po
index 98ca721..6351bf0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-03-05 02:20-0500\n"
+"POT-Creation-Date: 2017-03-05 02:21-0500\n"
 "PO-Revision-Date: 2017-03-02 00:50+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -122,141 +122,120 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:586
+#: lxc/image.go:588
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/snapshot.go:61
+#: lxc/snapshot.go:58
 msgid "'/' not allowed in snapshot name"
 msgstr "'/' はスナップショットの名前には使用できません"
 
-#: lxc/profile.go:254
+#: lxc/profile.go:293
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:607 lxc/image.go:649
+#: lxc/image.go:609 lxc/image.go:651
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:611
+#: lxc/image.go:613
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:406
+#: lxc/list.go:430
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:51
+#: lxc/remote.go:65
 msgid "Accept certificate"
 msgstr "証明書を受け入れます"
 
-#: lxc/remote.go:267
+#: lxc/remote.go:281
 #, c-format
 msgid "Admin password for %s: "
 msgstr "%s の管理者パスワード: "
 
-#: lxc/image.go:334
+#: lxc/image.go:336
 msgid "Aliases:"
 msgstr "エイリアス:"
 
-#: lxc/image.go:312 lxc/info.go:93
+#: lxc/image.go:314 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr "アーキテクチャ: %s"
 
-#: lxc/image.go:338
+#: lxc/image.go:340
 #, c-format
 msgid "Auto update: %s"
 msgstr "自動更新: %s"
 
-#: lxc/help.go:49
-msgid "Available commands:"
-msgstr "使用可能なコマンド:"
-
-#: lxc/info.go:186
+#: lxc/info.go:188
 msgid "Bytes received"
 msgstr "受信バイト数"
 
-#: lxc/info.go:187
+#: lxc/info.go:189
 msgid "Bytes sent"
 msgstr "送信バイト数"
 
-#: lxc/config.go:274
+#: lxc/config.go:310
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:150
+#: lxc/info.go:152
 msgid "CPU usage (in seconds)"
 msgstr "CPU使用量(秒)"
 
-#: lxc/info.go:154
+#: lxc/info.go:156
 msgid "CPU usage:"
 msgstr "CPU使用量:"
 
-#: lxc/list.go:407
+#: lxc/list.go:431
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/config.go:114 lxc/network.go:471
+#: lxc/config.go:150 lxc/network.go:495
 #, c-format
 msgid "Can't read from stdin: %s"
 msgstr "標準入力から読み込めません: %s"
 
-#: lxc/config.go:127 lxc/config.go:160 lxc/config.go:182
+#: lxc/config.go:163 lxc/config.go:196 lxc/config.go:218
 #, c-format
 msgid "Can't unset key '%s', it's not currently set."
 msgstr "キー '%s' が指定されていないので削除できません。"
 
-#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
+#: lxc/network.go:422 lxc/profile.go:472 lxc/storage.go:579
 msgid "Cannot provide container name to list"
 msgstr "コンテナ名を取得できません"
 
-#: lxc/remote.go:217
+#: lxc/remote.go:231
 #, c-format
 msgid "Certificate fingerprint: %x"
 msgstr "証明書のフィンガープリント: %x"
 
-#: lxc/action.go:36
-#, c-format
-msgid ""
-"Change state of one or more containers to %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-msgstr ""
-"1つまたは複数のコンテナの状態を %s に変更します。\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/finger.go:15
-msgid ""
-"Check if the LXD instance is up.\n"
-"\n"
-"lxc finger [<remote>:]"
-msgstr ""
-"LXDインスタンスが稼働中かを確認します。\n"
-"\n"
-"lxc finger [<remote>:]"
-
-#: lxc/remote.go:290
+#: lxc/remote.go:304
 msgid "Client certificate stored at server: "
 msgstr "クライアント証明書がサーバに格納されました: "
 
-#: lxc/list.go:101 lxc/list.go:102
+#: lxc/list.go:125 lxc/list.go:126
 msgid "Columns"
 msgstr "カラムレイアウト"
 
-#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:137 lxc/init.go:138
+#: lxc/help.go:53
+msgid "Commands:"
+msgstr ""
+
+#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:135 lxc/init.go:136
 msgid "Config key/value to apply to the new container"
 msgstr "新しいコンテナに適用するキー/値の設定"
 
-#: lxc/config.go:535 lxc/config.go:600 lxc/image.go:703 lxc/network.go:354
-#: lxc/profile.go:218 lxc/storage.go:497 lxc/storage.go:802
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:705 lxc/network.go:378
+#: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:840
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "設定の構文エラー: %s"
 
-#: lxc/main.go:29
+#: lxc/main.go:32
 msgid "Connection refused; is LXD running?"
 msgstr "接続が拒否されました。LXDが実行されていますか?"
 
@@ -264,7 +243,7 @@ msgstr "接続が拒否されました。LXDが実行されていますか?"
 msgid "Container name is mandatory"
 msgstr "コンテナ名を指定する必要があります"
 
-#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:246
+#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:244
 #, c-format
 msgid "Container name is: %s"
 msgstr "コンテナ名: %s"
@@ -274,91 +253,47 @@ msgstr "コンテナ名: %s"
 msgid "Container published with fingerprint: %s"
 msgstr "コンテナは以下のフィンガープリントで publish されます: %s"
 
-#: lxc/image.go:132
+#: lxc/image.go:134
 msgid "Copy aliases from source"
 msgstr "ソースからエイリアスをコピーしました"
 
-#: lxc/copy.go:25
-msgid ""
-"Copy containers within or in between LXD instances.\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
-"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-msgstr ""
-"LXDインスタンス内もしくはLXDインスタンス間でコンテナをコピーします。\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]\n"
-"[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-
-#: lxc/image.go:245
+#: lxc/image.go:247
 #, c-format
 msgid "Copying the image: %s"
 msgstr "イメージのコピー中: %s"
 
-#: lxc/remote.go:232
+#: lxc/remote.go:246
 msgid "Could not create server cert dir"
 msgstr "サーバ証明書格納用のディレクトリを作成できません"
 
-#: lxc/file.go:84
+#: lxc/file.go:91
 #, c-format
 msgid "Could not sanitize path %s"
 msgstr "パス %s をサニタイズできません"
 
-#: lxc/snapshot.go:21
-msgid ""
-"Create a read-only snapshot of a container.\n"
-"\n"
-"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Creates a snapshot of the container (optionally with the container's memory\n"
-"state). When --stateful is used, LXD attempts to checkpoint the container's\n"
-"running state, including process memory state, TCP connections, etc. so that "
-"it\n"
-"can be restored (via lxc restore) at a later time (although some things, e."
-"g.\n"
-"TCP connections after the TCP timeout window has expired, may not be "
-"restored\n"
-"successfully).\n"
-"\n"
-"Example:\n"
-"    lxc snapshot u1 snap0"
-msgstr ""
-"コンテナの読み取り専用のスナップショットを作成します。\n"
-"\n"
-"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"コンテナのスナップショットを作成します (オプションでコンテナのメモリ状態を\n"
-"含めて)。--statefulが指定された場合、LXDはコンテナプロセスのメモリ状態、TCP\n"
-"接続などの実行状態を、あとでlxc restoreを使ってリストアできるように、コンテ\n"
-"ナのチェックポイントを取得しようとします (しかし、タイムアウトウィンドウが\n"
-"expireしたあとのTCP接続のように正常にリストアできないものもあります)\n"
-"\n"
-"例:\n"
-"lxc snapshot u1 snap0"
-
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:67 lxc/file.go:68
 msgid "Create any directories necessary"
 msgstr "必要なディレクトリをすべて作成します"
 
-#: lxc/image.go:317 lxc/info.go:95
+#: lxc/image.go:319 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr "作成日時: %s"
 
-#: lxc/init.go:184 lxc/launch.go:139
+#: lxc/init.go:182 lxc/launch.go:137
 #, c-format
 msgid "Creating %s"
 msgstr "%s を作成中"
 
-#: lxc/init.go:182
+#: lxc/init.go:180
 msgid "Creating the container"
 msgstr "コンテナを作成中"
 
-#: lxc/image.go:610 lxc/image.go:651
+#: lxc/image.go:612 lxc/image.go:653
 msgid "DESCRIPTION"
 msgstr ""
 
-#: lxc/storage.go:570
+#: lxc/storage.go:608
 msgid "DRIVER"
 msgstr ""
 
@@ -366,51 +301,33 @@ msgstr ""
 msgid "Define a compression algorithm: for image or none"
 msgstr "圧縮アルゴリズムを指定します: 圧縮アルゴリズム名 or none"
 
-#: lxc/delete.go:26
-msgid ""
-"Delete containers or snapshots.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Destroy containers or snapshots with any attached data (configuration, "
-"snapshots, ...)."
-msgstr ""
-"コンテナもしくはコンテナのスナップショットを消去します。\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"付属するデータ (設定、スナップショット、...) と一緒にコンテナもしくはコンテ\n"
-"ナのスナップショットを消去します。"
-
-#: lxc/config.go:652
+#: lxc/config.go:688
 #, c-format
 msgid "Device %s added to %s"
 msgstr "デバイス %s が %s に追加されました"
 
-#: lxc/config.go:839
+#: lxc/config.go:875
 #, c-format
 msgid "Device %s removed from %s"
 msgstr "デバイス %s が %s から削除されました"
 
-#: lxc/info.go:143
+#: lxc/info.go:145
 msgid "Disk usage:"
 msgstr "ディスク使用量:"
 
-#: lxc/list.go:554
+#: lxc/list.go:578
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config.go:276
+#: lxc/config.go:312
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/main.go:41
+#: lxc/main.go:44
 msgid "Enable debug mode"
 msgstr "デバッグモードを有効にします"
 
-#: lxc/main.go:40
+#: lxc/main.go:43
 msgid "Enable verbose mode"
 msgstr "詳細モードを有効にします"
 
@@ -418,11 +335,11 @@ msgstr "詳細モードを有効にします"
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr "環境変数を設定します (例: HOME=/home/foo)"
 
-#: lxc/help.go:69
+#: lxc/help.go:77
 msgid "Environment:"
 msgstr "環境変数:"
 
-#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:141 lxc/init.go:142
+#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:139 lxc/init.go:140
 msgid "Ephemeral container"
 msgstr "Ephemeral コンテナ"
 
@@ -430,151 +347,104 @@ msgstr "Ephemeral コンテナ"
 msgid "Event type to listen for"
 msgstr "Listenするイベントタイプ"
 
-#: lxc/exec.go:46
-msgid ""
-"Execute the specified command in a container.\n"
-"\n"
-"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
-"env KEY=VALUE...] [--] <command line>\n"
-"\n"
-"Mode defaults to non-interactive, interactive mode is selected if both stdin "
-"AND stdout are terminals (stderr is ignored)."
-msgstr ""
-"指定したコマンドをコンテナ内で実行します。\n"
-"\n"
-"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
-"env KEY=VALUE...] [--] <command line>\n"
-"\n"
-"デフォルトのモードは non-interactive です。もし標準入出力が両方ともターミナ\n"
-"ルの場合は interactive モードが選択されます (標準エラー出力は無視されます)。"
-
-#: lxc/image.go:321
+#: lxc/image.go:323
 #, c-format
 msgid "Expires: %s"
 msgstr "失効日時: %s"
 
-#: lxc/image.go:323
+#: lxc/image.go:325
 msgid "Expires: never"
 msgstr "失効日時: 失効しない"
 
-#: lxc/config.go:273 lxc/image.go:608 lxc/image.go:650
+#: lxc/config.go:309 lxc/image.go:610 lxc/image.go:652
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/list.go:104
-msgid "Fast mode (same as --columns=nsacPt"
+#: lxc/manpage.go:62
+#, c-format
+msgid "Failed to generate 'lxc.%s.1': %v"
+msgstr ""
+
+#: lxc/manpage.go:55
+#, c-format
+msgid "Failed to generate 'lxc.1': %v"
+msgstr ""
+
+#: lxc/list.go:128
+#, fuzzy
+msgid "Fast mode (same as --columns=nsacPt)"
 msgstr "Fast モード (--columns=nsacPt と同じ)"
 
-#: lxc/image.go:310
+#: lxc/image.go:312
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
 
-#: lxc/action.go:45 lxc/action.go:46
+#: lxc/action.go:46 lxc/action.go:47
 msgid "Force the container to shutdown"
 msgstr "コンテナを強制シャットダウンします"
 
-#: lxc/delete.go:35 lxc/delete.go:36
+#: lxc/delete.go:33 lxc/delete.go:34
 msgid "Force the removal of stopped containers"
 msgstr "停止したコンテナを強制的に削除します"
 
-#: lxc/main.go:42
+#: lxc/main.go:45
 msgid "Force using the local unix socket"
 msgstr "強制的にローカルのUNIXソケットを使います"
 
-#: lxc/image.go:135 lxc/list.go:103
+#: lxc/image.go:137 lxc/list.go:127
 msgid "Format"
 msgstr "フォーマット"
 
-#: lxc/remote.go:65
+#: lxc/remote.go:79
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "クライアント証明書を生成します。1分ぐらいかかります..."
 
-#: lxc/help.go:25
-msgid ""
-"Help page for the LXD client.\n"
-"\n"
-"lxc help [--all]"
-msgstr ""
-"LXDクライアントのヘルプページを表示します。\n"
-"\n"
-"lxd help [--all]"
-
-#: lxc/list.go:404
+#: lxc/list.go:428
 msgid "IPV4"
 msgstr "IPV4"
 
-#: lxc/list.go:405
+#: lxc/list.go:429
 msgid "IPV6"
 msgstr "IPV6"
 
-#: lxc/config.go:275
+#: lxc/config.go:311
 msgid "ISSUE DATE"
 msgstr ""
 
-#: lxc/main.go:136
+#: lxc/main.go:139
 #, fuzzy
 msgid "If this is your first time using LXD, you should also run: lxd init"
 msgstr "初めて LXD を使う場合、sudo lxd init と実行する必要があります"
 
-#: lxc/main.go:43
+#: lxc/main.go:46
 msgid "Ignore aliases when determining what command to run"
 msgstr "どのコマンドを実行するか決める際にエイリアスを無視します"
 
-#: lxc/action.go:49
+#: lxc/action.go:50
 msgid "Ignore the container state (only for start)"
 msgstr "コンテナの状態を無視します (startのみ)"
 
-#: lxc/image.go:248
+#: lxc/image.go:250
 msgid "Image copied successfully!"
 msgstr "イメージのコピーが成功しました!"
 
-#: lxc/image.go:393 lxc/image.go:405
+#: lxc/image.go:395 lxc/image.go:407
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "イメージは以下のフィンガープリントでインポートされました: %s"
 
-#: lxc/image.go:390
+#: lxc/image.go:392
 #, c-format
 msgid "Importing the image: %s"
 msgstr "イメージのインポート中: %s"
 
-#: lxc/init.go:75
-msgid ""
-"Initialize a container from a particular image.\n"
-"\n"
-"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
-"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--"
-"storage|-s <pool>]\n"
-"\n"
-"Initializes a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc init ubuntu:16.04 u1"
-msgstr ""
-"指定したイメージからコンテナを初期化します。\n"
-"\n"
-"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
-"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--"
-"storage|-s <pool>]\n"
-"\n"
-"指定したイメージとコンテナ名を使ってコンテナを初期化します。\n"
-"\n"
-"-p を指定しない場合はデフォルトのプロファイルを使います。\n"
-"\"-p\" のように引数なしで -p を使うとプロファイルなしとなります。\n"
-"\n"
-"例:\n"
-"    lxc init ubuntu:16.04 u1"
-
-#: lxc/remote.go:135
+#: lxc/remote.go:149
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr "不正な URL スキーム \"%s\" (\"%s\" 内)"
 
-#: lxc/config.go:254
+#: lxc/config.go:290
 msgid "Invalid certificate"
 msgstr "不正な証明書です"
 
@@ -582,221 +452,55 @@ msgstr "不正な証明書です"
 msgid "Invalid configuration key"
 msgstr "正しくない設定項目 (key) です"
 
-#: lxc/file.go:352
+#: lxc/file.go:359
 #, c-format
 msgid "Invalid path %s"
 msgstr "不正なパス %s"
 
-#: lxc/file.go:286
+#: lxc/file.go:293
 #, c-format
 msgid "Invalid source %s"
 msgstr "不正なソース %s"
 
-#: lxc/file.go:73
+#: lxc/file.go:80
 #, c-format
 msgid "Invalid target %s"
 msgstr "不正な送り先 %s"
 
-#: lxc/info.go:124
+#: lxc/info.go:126
 msgid "Ips:"
 msgstr "IPアドレス:"
 
-#: lxc/image.go:133
+#: lxc/image.go:135
 msgid "Keep the image up to date after initial copy"
 msgstr "最初にコピーした後も常にイメージを最新の状態に保つ"
 
-#: lxc/list.go:408
+#: lxc/list.go:432
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/main.go:27
+#: lxc/main.go:30
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr "LXD のソケットが見つかりません。LXD が実行されていますか?"
 
-#: lxc/image.go:326
+#: lxc/image.go:328
 #, c-format
 msgid "Last used: %s"
 msgstr "最終使用: %s"
 
-#: lxc/image.go:328
+#: lxc/image.go:330
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid ""
-"Launch a container from a particular image.\n"
-"\n"
-"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
-"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
-"<network>] [--storage|-s <pool>]\n"
-"\n"
-"Launches a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc launch ubuntu:16.04 u1"
-msgstr ""
-"指定したイメージからコンテナを起動します。\n"
-"\n"
-"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
-"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
-"<network>] [--storage|-s <pool>]\n"
-"\n"
-"指定したイメージと名前を使ってコンテナを起動します。\n"
-"\n"
-"-p を指定しない場合はデフォルトのプロファイルを使います。\n"
-"\"-p\" のように引数なしで -p を使うとプロファイルなしとなります。\n"
-"\n"
-"例:\n"
-"    lxc launch ubuntu:16.04 u1"
-
-#: lxc/info.go:25
-msgid ""
-"List information on LXD servers and containers.\n"
-"\n"
-"For a container:\n"
-"    lxc info [<remote:>]<container> [--show-log]\n"
-"\n"
-"For a server:\n"
-"    lxc info [<remote:>]"
-msgstr ""
-"LXD サーバとコンテナの情報を一覧表示します。\n"
-"\n"
-"コンテナ情報:\n"
-"    lxc info [<remote>:]<container> [--show-log]\n"
-"\n"
-"サーバ情報:\n"
-"    lxc info [<remote>:]"
-
-#: lxc/list.go:47
-msgid ""
-"Lists the containers.\n"
-"\n"
-"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
-"fast]\n"
-"\n"
-"The filters are:\n"
-"* A single keyword like \"web\" which will list any container with a name "
-"starting by \"web\".\n"
-"* A regular expression on the container name. (e.g. .*web.*01$)\n"
-"* A key/value pair referring to a configuration item. For those, the "
-"namespace can be abbreviated to the smallest unambiguous identifier:\n"
-" * \"user.blah=abc\" will list all containers with the \"blah\" user "
-"property set to \"abc\".\n"
-" * \"u.blah=abc\" will do the same\n"
-" * \"security.privileged=1\" will list all privileged containers\n"
-" * \"s.privileged=1\" will do the same\n"
-"* A regular expression matching a configuration item or its value. (e.g. "
-"volatile.eth0.hwaddr=00:16:3e:.*)\n"
-"\n"
-"The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table format.\n"
-"Column arguments are either pre-defined shorthand chars (see below),\n"
-"or (extended) config keys.  Commas between consecutive shorthand chars\n"
-"are optional.\n"
-"\n"
-"Pre-defined shorthand chars:\n"
-"* 4 - IPv4 address\n"
-"* 6 - IPv6 address\n"
-"* a - architecture\n"
-"* b - storage pool\n"
-"* c - creation date\n"
-"* l - last used date\n"
-"* n - name\n"
-"* p - pid of container init process\n"
-"* P - profiles\n"
-"* s - state\n"
-"* S - number of snapshots\n"
-"* t - type (persistent or ephemeral)\n"
-"\n"
-"Config key syntax: key[:name][:maxWidth]\n"
-"* key      - The (extended) config key to display\n"
-"* name     - Name to display in the column header, defaults to the key\n"
-"             if not specified or if empty (to allow defining maxWidth\n"
-"             without a custom name, e.g. user.key::0)\n"
-"* maxWidth - Max width of the column (longer results are truncated).\n"
-"             -1 == unlimited\n"
-"              0 == width of column header\n"
-"             >0 == max width in chars\n"
-"             Default is -1 (unlimited)\n"
-"\n"
-"Default column layout: ns46tS\n"
-"Fast column layout: nsacPt\n"
-"\n"
-"Example:\n"
-"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
-"hwaddr:MAC"
-msgstr ""
-"コンテナを一覧表示します。\n"
-"\n"
-"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
-"fast]\n"
-"\n"
-"フィルタの指定:\n"
-"* 単一の \"web\" のようなキーワードを指定すると、名前が \"web\" ではじまるコ"
-"ンテ\n"
-"  ナが一覧表示されます。\n"
-"* コンテナ名の正規表現 (例: .*web.*01$)\n"
-"* 設定項目のキーと値。キーの名前空間は一意に識別できる場合は短縮することが"
-"で\n"
-"  きます:\n"
-" * \"user.blah=abc\" は \"blah\" という user プロパティが \"abc\" に設定され"
-"ている\n"
-"  コンテナをすべて一覧表示します。\n"
-" * \"u.blah=abc\" は上記と同じ意味になります。\n"
-" * \"security.privileged=1\" は特権コンテナをすべて一覧表示します。\n"
-" * \"s.privilaged=1\" は上記と同じ意味になります。\n"
-" * 設定項目もしくは値とマッチする正規表現\n"
-"   (例:volatile.eth0.hwaddr=00:16:3e:.*)\n"
-"\n"
-"-c オプションには、表形式で表示する際にどのコンテナの属性を表示するか\n"
-"を指定するコンマ区切りのリストを指定します。カラムの指定は、定義済みの\n"
-"短縮形 (以下を参照) もしくは (拡張された) 設定キーのどちらかを指定しま\n"
-"す。連続する短縮形の間のコンマは省略できます。\n"
-"\n"
-"短縮形で指定できる文字:\n"
-"* 4 - IPv4 アドレス\n"
-"* 6 - IPv6 アドレス\n"
-"* a - アーキテクチャ\n"
-"* b - ストレージプール\n"
-"* c - 作成日\n"
-"* l - 最終使用日\n"
-"* n - 名前\n"
-"* p - コンテナの init プロセスの pid\n"
-"* P - プロファイル\n"
-"* s - 状態\n"
-"* S - スナップショットの数\n"
-"* t - タイプ (persistent or ephemeral)\n"
-"\n"
-"設定キーの文法: key[:name][:maxWidth]\n"
-"* key      - 表示する (拡張された) 設定キー\n"
-"* name     - カラムのヘッダに表示する名前。指定しない場合、もしくは空\n"
-"             の場合のデフォルトはキー。\n"
-"             (名前を指定せずに maxWidth を指定できます。例: user.key::0)\n"
-"* maxWidth - カラムの最大幅 (結果がこれより長い場合は切り詰められます)\n"
-"             -1 == 制限なし\n"
-"              0 == カラムヘッダの幅\n"
-"             >0 == 文字列の最大幅\n"
-"             デフォルトは -1 (制限なし)\n"
-"\n"
-"デフォルトのカラムレイアウト: ns46tS\n"
-"Fast モードのカラムレイアウト: nsacPt\n"
-"\n"
-"例:\n"
-"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
-"hwaddr:MAC"
-
-#: lxc/info.go:239
+#: lxc/info.go:241
 msgid "Log:"
 msgstr "ログ:"
 
-#: lxc/network.go:436
+#: lxc/network.go:460
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:131
+#: lxc/image.go:133
 msgid "Make image public"
 msgstr "イメージを public にする"
 
@@ -804,187 +508,637 @@ msgstr "イメージを public にする"
 msgid "Make the image public"
 msgstr "イメージを public にする"
 
-#: lxc/profile.go:49
-msgid ""
-"Manage configuration profiles.\n"
-"\n"
-"lxc profile list [<remote>:]                                    List "
-"available profiles.\n"
-"lxc profile show [<remote>:]<profile>                           Show details "
-"of a profile.\n"
-"lxc profile create [<remote>:]<profile>                         Create a "
-"profile.\n"
-"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>      Copy the "
-"profile.\n"
-"lxc profile get [<remote>:]<profile> <key>                      Get profile "
-"configuration.\n"
-"lxc profile set [<remote>:]<profile> <key> <value>              Set profile "
-"configuration.\n"
-"lxc profile unset [<remote>:]<profile> <key>                    Unset "
-"profile configuration.\n"
-"lxc profile delete [<remote>:]<profile>                         Delete a "
-"profile.\n"
-"lxc profile edit [<remote>:]<profile>\n"
-"    Edit profile, either by launching external editor or reading STDIN.\n"
-"    Example: lxc profile edit <profile> # launch editor\n"
-"             cat profile.yaml | lxc profile edit <profile> # read from "
-"profile.yaml\n"
-"\n"
-"lxc profile assign [<remote>:]<container> <profiles>\n"
-"    Assign a comma-separated list of profiles to a container, in order.\n"
-"    All profiles passed in this call (and only those) will be applied\n"
-"    to the specified container, i.e. it sets the list of profiles exactly "
-"to\n"
-"    those specified in this command. To add/remove a particular profile from "
-"a\n"
-"    container, use {add|remove} below.\n"
-"    Example: lxc profile assign foo default,bar # Apply default and bar\n"
-"             lxc profile assign foo default # Only default is active\n"
-"             lxc profile assign '' # no profiles are applied anymore\n"
-"             lxc profile assign bar,default # Apply default second now\n"
-"lxc profile add [<remote>:]<container> <profile> # add a profile to a "
-"container\n"
-"lxc profile remove [<remote>:]<container> <profile> # remove the profile "
-"from a container\n"
-"\n"
-"Devices:\n"
-"lxc profile device list [<remote>:]<profile>                                "
-"List devices in the given profile.\n"
-"lxc profile device show [<remote>:]<profile>                                "
-"Show full device details in the given profile.\n"
-"lxc profile device remove [<remote>:]<profile> <name>                       "
-"Remove a device from a profile.\n"
-"lxc profile device get [<remote>:]<profile> <name> <key>                    "
-"Get a device property.\n"
-"lxc profile device set [<remote>:]<profile> <name> <key> <value>            "
-"Set a device property.\n"
-"lxc profile device unset [<remote>:]<profile> <name> <key>                  "
-"Unset a device property.\n"
-"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
-"    Add a profile device, such as a disk or a nic, to the containers using "
-"the specified profile."
+#: lxc/info.go:163
+msgid "Memory (current)"
+msgstr "メモリ (現在値)"
+
+#: lxc/info.go:167
+msgid "Memory (peak)"
+msgstr "メモリ (ピーク)"
+
+#: lxc/info.go:179
+msgid "Memory usage:"
+msgstr "メモリ消費量:"
+
+#: lxc/utils.go:173
+msgid "Missing summary."
+msgstr "サマリーはありません。"
+
+#: lxc/network.go:248 lxc/network.go:297 lxc/storage.go:362 lxc/storage.go:462
+msgid "More than one device matches, specify the device name."
+msgstr "複数のデバイスとマッチします。デバイス名を指定してください。"
+
+#: lxc/file.go:281
+msgid "More than one file to download, but target is not a directory"
+msgstr ""
+"ダウンロード対象のファイルが複数ありますが、コピー先がディレクトリではありま"
+"せん"
+
+#: lxc/action.go:68
+msgid "Must supply container name for: "
+msgstr "コンテナ名を指定する必要があります: "
+
+#: lxc/list.go:433 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:394
+#: lxc/storage.go:607 lxc/storage.go:687
+msgid "NAME"
+msgstr ""
+
+#: lxc/network.go:444 lxc/remote.go:368 lxc/remote.go:373
+msgid "NO"
+msgstr ""
+
+#: lxc/info.go:91
+#, c-format
+msgid "Name: %s"
+msgstr "コンテナ名: %s"
+
+#: lxc/network.go:222
+#, c-format
+msgid "Network %s created"
+msgstr "ネットワーク %s を作成しました"
+
+#: lxc/network.go:325
+#, c-format
+msgid "Network %s deleted"
+msgstr "ネットワーク %s を削除しました"
+
+#: lxc/init.go:141 lxc/init.go:142
+msgid "Network name"
+msgstr "ネットワーク名:"
+
+#: lxc/info.go:196
+msgid "Network usage:"
+msgstr "ネットワーク使用状況:"
+
+#: lxc/image.go:136 lxc/publish.go:35
+msgid "New alias to define at target"
+msgstr "新しいエイリアスを定義する"
+
+#: lxc/config.go:321
+msgid "No certificate provided to add"
+msgstr "追加すべき証明書が提供されていません"
+
+#: lxc/network.go:257 lxc/network.go:306
+msgid "No device found for this network"
+msgstr "このネットワークに対するデバイスがありません"
+
+#: lxc/storage.go:371 lxc/storage.go:471
+msgid "No device found for this storage volume."
+msgstr "このストレージボリュームに対するデバイスがありません。"
+
+#: lxc/config.go:344
+msgid "No fingerprint specified."
+msgstr "フィンガープリントが指定されていません。"
+
+#: lxc/storage.go:323 lxc/storage.go:407
+msgid "Only \"custom\" volumes can be attached to containers."
+msgstr "\"カスタム\" のボリュームのみがコンテナにアタッチできます。"
+
+#: lxc/remote.go:134
+msgid "Only https URLs are supported for simplestreams"
+msgstr "simplestreams は https の URL のみサポートします"
+
+#: lxc/image.go:398
+msgid "Only https:// is supported for remote image import."
+msgstr "リモートイメージのインポートは https:// のみをサポートします。"
+
+#: lxc/network.go:354 lxc/network.go:481
+msgid "Only managed networks can be modified."
+msgstr "管理対象のネットワークのみ変更できます。"
+
+#: lxc/help.go:71 lxc/main.go:112 lxc/main.go:163
+msgid "Options:"
+msgstr "オプション:"
+
+#: lxc/image.go:509
+#, c-format
+msgid "Output is in %s"
+msgstr "%s に出力されます"
+
+#: lxc/exec.go:56
+msgid "Override the terminal mode (auto, interactive or non-interactive)"
+msgstr "ターミナルモードを上書きします (auto, interactive, non-interactive)"
+
+#: lxc/list.go:580
+msgid "PERSISTENT"
+msgstr ""
+
+#: lxc/list.go:434
+msgid "PID"
+msgstr "PID"
+
+#: lxc/list.go:435
+msgid "PROFILES"
+msgstr ""
+
+#: lxc/remote.go:396
+msgid "PROTOCOL"
+msgstr ""
+
+#: lxc/image.go:611 lxc/remote.go:397
+msgid "PUBLIC"
+msgstr ""
+
+#: lxc/info.go:190
+msgid "Packets received"
+msgstr "受信パケット"
+
+#: lxc/info.go:191
+msgid "Packets sent"
+msgstr "送信パケット"
+
+#: lxc/help.go:78
+msgid "Path to an alternate client configuration directory"
+msgstr "別のクライアント用設定ディレクトリ"
+
+#: lxc/help.go:79
+msgid "Path to an alternate server directory"
+msgstr "別のサーバ用設定ディレクトリ"
+
+#: lxc/main.go:202
+#, fuzzy
+msgid "Pause containers."
+msgstr "コンテナの不正なURL %s"
+
+#: lxc/main.go:34
+msgid "Permission denied, are you in the lxd group?"
+msgstr "アクセスが拒否されました。lxd グループに所属していますか?"
+
+#: lxc/info.go:108
+#, c-format
+msgid "Pid: %d"
+msgstr "Pid: %d"
+
+#: lxc/network.go:379 lxc/profile.go:258 lxc/storage.go:536 lxc/storage.go:841
+msgid "Press enter to open the editor again"
+msgstr "再度エディタを開くためには Enter キーを押します"
+
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:706
+msgid "Press enter to start the editor again"
+msgstr "再度エディタを起動するには Enter キーを押します"
+
+#: lxc/help.go:73
+msgid "Print debug information"
+msgstr "デバッグ情報を表示します"
+
+#: lxc/help.go:72
+msgid "Print less common commands"
+msgstr "全てのコマンドを表示します (主なコマンドだけではなく)"
+
+#: lxc/help.go:74
+msgid "Print verbose information"
+msgstr "詳細情報を表示します"
+
+#: lxc/info.go:132
+#, c-format
+msgid "Processes: %d"
+msgstr "プロセス数: %d"
+
+#: lxc/profile.go:314
+#, c-format
+msgid "Profile %s added to %s"
+msgstr "プロファイル %s が %s に追加されました"
+
+#: lxc/profile.go:209
+#, c-format
+msgid "Profile %s created"
+msgstr "プロファイル %s を作成しました"
+
+#: lxc/profile.go:279
+#, c-format
+msgid "Profile %s deleted"
+msgstr "プロファイル %s を削除しました"
+
+#: lxc/profile.go:345
+#, c-format
+msgid "Profile %s removed from %s"
+msgstr "プロファイル %s が %s から削除されました"
+
+#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:137 lxc/init.go:138
+msgid "Profile to apply to the new container"
+msgstr "新しいコンテナに適用するプロファイル"
+
+#: lxc/profile.go:295
+#, c-format
+msgid "Profiles %s applied to %s"
+msgstr "プロファイル %s が %s に追加されました"
+
+#: lxc/info.go:106
+#, c-format
+msgid "Profiles: %s"
+msgstr "プロファイル: %s"
+
+#: lxc/image.go:332
+msgid "Properties:"
+msgstr "プロパティ:"
+
+#: lxc/remote.go:68
+msgid "Public image server"
+msgstr "Public なイメージサーバとして設定します"
+
+#: lxc/image.go:315
+#, c-format
+msgid "Public: %s"
+msgstr "パブリック: %s"
+
+#: lxc/file.go:65 lxc/file.go:66
+msgid "Recursively push or pull files"
+msgstr "再帰的にファイルをpush/pullします"
+
+#: lxc/remote.go:66
+msgid "Remote admin password"
+msgstr "リモートの管理者パスワード"
+
+#: lxc/info.go:93
+#, c-format
+msgid "Remote: %s"
+msgstr "リモート名: %s"
+
+#: lxc/delete.go:41
+#, c-format
+msgid "Remove %s (yes/no): "
+msgstr "%s を消去しますか (yes/no): "
+
+#: lxc/delete.go:35 lxc/delete.go:36
+msgid "Require user confirmation"
+msgstr "ユーザの確認を要求する"
+
+#: lxc/info.go:129
+msgid "Resources:"
+msgstr "リソース:"
+
+#: lxc/main.go:210
+#, fuzzy
+msgid "Restart containers."
+msgstr "コンテナを作成中"
+
+#: lxc/init.go:254
+#, c-format
+msgid "Retrieving image: %s"
+msgstr "イメージの取得中: %s"
+
+#: lxc/image.go:614
+msgid "SIZE"
+msgstr ""
+
+#: lxc/list.go:436
+msgid "SNAPSHOTS"
+msgstr ""
+
+#: lxc/storage.go:609
+msgid "SOURCE"
+msgstr ""
+
+#: lxc/list.go:437
+msgid "STATE"
+msgstr ""
+
+#: lxc/remote.go:398
+msgid "STATIC"
+msgstr ""
+
+#: lxc/list.go:439
+msgid "STORAGE POOL"
+msgstr ""
+
+#: lxc/remote.go:239
+msgid "Server certificate NACKed by user"
+msgstr "ユーザによりサーバ証明書が拒否されました"
+
+#: lxc/remote.go:301
+msgid "Server doesn't trust us after adding our cert"
+msgstr "サーバが我々の証明書を追加した後我々を信頼していません"
+
+#: lxc/remote.go:67
+msgid "Server protocol (lxd or simplestreams)"
+msgstr "サーバのプロトコル (lxd or simplestreams)"
+
+#: lxc/file.go:63
+msgid "Set the file's gid on push"
+msgstr "プッシュ時にファイルのgidを設定します"
+
+#: lxc/file.go:64
+msgid "Set the file's perms on push"
+msgstr "プッシュ時にファイルのパーミションを設定します"
+
+#: lxc/file.go:62
+msgid "Set the file's uid on push"
+msgstr "プッシュ時にファイルのuidを設定します"
+
+#: lxc/help.go:29
+msgid "Show all commands (not just interesting ones)"
+msgstr "全てコマンドを表示します (主なコマンドだけではなく)"
+
+#: lxc/help.go:75
+msgid "Show client version"
+msgstr "クライアントのバージョンを表示します"
+
+#: lxc/info.go:38
+msgid "Show the container's last 100 log lines?"
+msgstr "コンテナログの最後の 100 行を表示しますか?"
+
+#: lxc/config.go:33
+msgid "Show the expanded configuration"
+msgstr "拡張した設定を表示する"
+
+#: lxc/image.go:313
+#, c-format
+msgid "Size: %.2fMB"
+msgstr "サイズ: %.2fMB"
+
+#: lxc/info.go:210
+msgid "Snapshots:"
+msgstr "スナップショット:"
+
+#: lxc/action.go:134
+#, c-format
+msgid "Some containers failed to %s"
+msgstr "一部のコンテナで %s が失敗しました"
+
+#: lxc/image.go:342
+msgid "Source:"
+msgstr "取得元:"
+
+#: lxc/main.go:220
+#, fuzzy
+msgid "Start containers."
+msgstr "コンテナの不正なURL %s"
+
+#: lxc/launch.go:146
+#, c-format
+msgid "Starting %s"
+msgstr "%s を起動中"
+
+#: lxc/info.go:100
+#, c-format
+msgid "Status: %s"
+msgstr "状態: %s"
+
+#: lxc/main.go:226
+#, fuzzy
+msgid "Stop containers."
+msgstr "コンテナの停止に失敗しました!"
+
+#: lxc/publish.go:36 lxc/publish.go:37
+msgid "Stop the container if currently running"
+msgstr "実行中の場合、コンテナを停止します"
+
+#: lxc/delete.go:105 lxc/publish.go:114
+msgid "Stopping container failed!"
+msgstr "コンテナの停止に失敗しました!"
+
+#: lxc/storage.go:436
+#, c-format
+msgid "Storage pool %s created"
+msgstr "ストレージプール %s を作成しました"
+
+#: lxc/storage.go:486
+#, c-format
+msgid "Storage pool %s deleted"
+msgstr "ストレージプール %s を削除しました"
+
+#: lxc/init.go:143 lxc/init.go:144
+msgid "Storage pool name"
+msgstr "ストレージプール名"
+
+#: lxc/storage.go:710
+#, c-format
+msgid "Storage volume %s created"
+msgstr "ストレージボリューム %s を作成しました"
+
+#: lxc/storage.go:720
+#, c-format
+msgid "Storage volume %s deleted"
+msgstr "ストレージボリューム %s を削除しました"
+
+#: lxc/action.go:49
+msgid "Store the container state (only for stop)"
+msgstr "コンテナの状態を保存します (stopのみ)"
+
+#: lxc/info.go:171
+msgid "Swap (current)"
+msgstr "Swap (現在値)"
+
+#: lxc/info.go:175
+msgid "Swap (peak)"
+msgstr "Swap (ピーク)"
+
+#: lxc/list.go:438 lxc/network.go:459 lxc/storage.go:686
+msgid "TYPE"
 msgstr ""
-"設定プロファイルを管理します。\n"
+
+#: lxc/delete.go:91
+msgid "The container is currently running, stop it first or pass --force."
+msgstr "コンテナは実行中です。先に停止させるか、--force を指定してください。"
+
+#: lxc/publish.go:92
+msgid ""
+"The container is currently running. Use --force to have it stopped and "
+"restarted."
+msgstr ""
+"コンテナは現在実行中です。停止して、再起動するために --force を使用してくだ\n"
+"さい。"
+
+#: lxc/init.go:327
+msgid "The container you are starting doesn't have any network attached to it."
+msgstr "起動しようとしたコンテナに接続されているネットワークがありません。"
+
+#: lxc/config.go:716 lxc/config.go:728 lxc/config.go:761 lxc/config.go:779
+#: lxc/config.go:817 lxc/config.go:835
+msgid "The device doesn't exist"
+msgstr "デバイスが存在しません"
+
+#: lxc/init.go:311
+#, c-format
+msgid "The local image '%s' couldn't be found, trying '%s:' instead."
+msgstr ""
+"ローカルイメージ '%s' が見つかりません。代わりに '%s:' を試してみてください。"
+
+#: lxc/action.go:34
+#, fuzzy
+msgid "The opposite of \"lxc pause\" is \"lxc start\"."
+msgstr "`lxc pause` の反対のコマンドは `lxc start` です。"
+
+#: lxc/network.go:262 lxc/network.go:311 lxc/storage.go:376 lxc/storage.go:476
+msgid "The specified device doesn't exist"
+msgstr "指定したデバイスが存在しません"
+
+#: lxc/network.go:266 lxc/network.go:315
+msgid "The specified device doesn't match the network"
+msgstr "指定したデバイスはネットワークとマッチしません"
+
+#: lxc/publish.go:65
+msgid "There is no \"image name\".  Did you want an alias?"
+msgstr ""
+"publish 先にはイメージ名は指定できません。\"--alias\" オプションを使ってくだ"
+"さい。"
+
+#: lxc/help.go:47
+msgid ""
+"This is the LXD command line client.\n"
 "\n"
-"lxc profile list [<remote>:]\n"
-"    利用可能なプロファイルを一覧します。\n"
-"lxc profile show [<remote>:]<profile>\n"
-"    プロファイルの詳細を表示します。\n"
-"lxc profile create [<remote>:]<profile>\n"
-"    プロファイルを作成します。\n"
-"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
-"    プロファイルをコピーします。\n"
-"lxc profile get [<remote>:]<profile> <key>\n"
-"    プロファイルの設定を取得します。\n"
-"lxc profile set [<remote>:]<profile> <key> <value>\n"
-"    プロファイルの設定を設定します。\n"
-"lxc profile unset [<remote>:]<profile> <key>\n"
-"    プロファイルから設定項目を削除します。\n"
-"lxc profile delete [<remote>:]<profile>\n"
-"    プロファイルを削除します。\n"
-"lxc profile edit [<remote>:]<profile>\n"
-"    プロファイルを編集します。外部エディタもしくはSTDINから読み込みます。\n"
-"    例: lxc profile edit <profile> # エディタの起動\n"
-"        cat profile.yaml | lxc profile edit <profile> # profile.yaml から読み"
-"込み\n"
+"All of LXD's features can be driven through the various commands below.\n"
+"For help with any of those, simply call them with --help."
+msgstr ""
+
+#: lxc/action.go:45
+msgid "Time to wait for the container before killing it"
+msgstr "コンテナを強制停止するまでの時間"
+
+#: lxc/image.go:316
+msgid "Timestamps:"
+msgstr "タイムスタンプ:"
+
+#: lxc/init.go:329
+msgid "To attach a network to a container, use: lxc network attach"
+msgstr ""
+"コンテナにネットワークを接続するには、lxc network attach を使用してください"
+
+#: lxc/init.go:328
+msgid "To create a new network, use: lxc network create"
+msgstr ""
+"新しいネットワークを作成するには、lxc network create を使用してください"
+
+#: lxc/main.go:140
+msgid "To start your first container, try: lxc launch ubuntu:16.04"
+msgstr ""
+"初めてコンテナを起動するには、\"lxc launch ubuntu:16.04\" と実行してみてくだ"
+"さい"
+
+#: lxc/image.go:400
+#, c-format
+msgid "Transferring image: %s"
+msgstr "イメージを転送中: %s"
+
+#: lxc/action.go:98 lxc/launch.go:159
+#, c-format
+msgid "Try `lxc info --show-log %s` for more info"
+msgstr "更に情報を得るために `lxc info --show-log %s` を実行してみてください"
+
+#: lxc/info.go:102
+msgid "Type: ephemeral"
+msgstr "タイプ: ephemeral"
+
+#: lxc/info.go:104
+msgid "Type: persistent"
+msgstr "タイプ: persistent"
+
+#: lxc/image.go:615
+msgid "UPLOAD DATE"
+msgstr ""
+
+#: lxc/remote.go:395
+msgid "URL"
+msgstr ""
+
+#: lxc/network.go:461 lxc/profile.go:500 lxc/storage.go:610 lxc/storage.go:688
+msgid "USED BY"
+msgstr ""
+
+#: lxc/manpage.go:36
+msgid "Unable to find help2man."
+msgstr ""
+
+#: lxc/remote.go:109
+msgid "Unable to read remote TLS certificate"
+msgstr "リモートの TLS 証明書を読めません"
+
+#: lxc/image.go:321
+#, c-format
+msgid "Uploaded: %s"
+msgstr "アップロード日時: %s"
+
+#: lxc/action.go:37
+#, fuzzy, c-format
+msgid ""
+"Usage: lxc %s [<remote>:]<container> [[<remote>:]<container>...]\n"
 "\n"
-"lxc profile assign [<remote>:]<container> <profiles>\n"
-"    プロファイルのコンマ区切りのリストをコンテナに順番に割り当てます。\n"
-"    このコマンドで指定したプロファイルだけが対象のコンテナに適用されます。\n"
-"    つまり、コマンドで指定したコンテナに正確にプロファイルのリストを設定しま"
-"す。\n"
-"    コンテナから特定のプロファイルを追加したり削除したりするには、この\n"
-"    後の {add|remove} を使います。\n"
-"    例: lxc profile assign foo default,bar # defaultとbarを適用\n"
-"        lxc profile assign foo default # defaultだけを有効化\n"
-"        lxc profile assign '' # 一切のプロファイルを適用しない\n"
-"        lxc profile assign bar,default # defaultを2番目に適用\n"
-"lxc profile add [<remote>:]<container> <profile>\n"
-"    コンテナにプロファイルを追加します。\n"
-"lxc profile remove [<remote>:]<container> <profile>\n"
-"    コンテナからプロファイルを削除します。\n"
+"%s%s"
+msgstr ""
+"1つまたは複数のコンテナの状態を %s に変更します。\n"
 "\n"
-"デバイス:\n"
-"lxc profile device list [<remote>:]<profile>\n"
-"    指定したプロファイル内のデバイスを一覧表示します\n"
-"lxc profile device show [<remote>:]<profile>\n"
-"    指定したプロファイル内の全デバイスの詳細を表示します\n"
-"lxc profile device remove [<remote>:]<profile> <name>\n"
-"    プロファイルからデバイスを削除します\n"
-"lxc profile device get [<remote>:]<profile> <name> <key>\n"
-"    デバイスプロパティを取得します\n"
-"lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
-"    デバイスプロパティを設定します\n"
-"lxc profile device unset <[remote:]profile> <name> <key>\n"
-"    デバイスプロパティを削除します\n"
-"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
-"    ディスクやNICのようなプロファイルデバイスを指定したプロファイルを使って\n"
-"    コンテナに追加します。"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
+
+#: lxc/help.go:45
+msgid "Usage: lxc <command> [options]"
+msgstr "使い方: lxc <コマンド> [オプション]"
 
 #: lxc/config.go:58
+#, fuzzy
 msgid ""
-"Manage configuration.\n"
-"\n"
-"lxc config device add [<remote>:]<container> <device> <type> "
-"[key=value...]   Add a device to a container.\n"
-"lxc config device get [<remote>:]<container> <device> "
-"<key>                   Get a device property.\n"
-"lxc config device set [<remote>:]<container> <device> <key> "
-"<value>           Set a device property.\n"
-"lxc config device unset [<remote>:]<container> <device> "
-"<key>                 Unset a device property.\n"
-"lxc config device list "
-"[<remote>:]<container>                                 List devices for "
-"container.\n"
-"lxc config device show "
-"[<remote>:]<container>                                 Show full device "
-"details for container.\n"
-"lxc config device remove [<remote>:]<container> "
-"<name>                        Remove device from container.\n"
-"\n"
-"lxc config get [<remote>:][container] "
-"<key>                                   Get container or server "
-"configuration key.\n"
-"lxc config set [<remote>:][container] <key> "
-"<value>                           Set container or server configuration "
-"key.\n"
-"lxc config unset [<remote>:][container] "
-"<key>                                 Unset container or server "
-"configuration key.\n"
-"lxc config show [<remote>:][container] [--"
-"expanded]                           Show container or server configuration.\n"
-"lxc config edit [<remote>:]"
-"[container]                                        Edit container or server "
-"configuration in external editor.\n"
+"Usage: lxc config <subcommand> [options]\n"
+"\n"
+"Change container or server configuration options.\n"
+"\n"
+"*Container configuration*\n"
+"\n"
+"lxc config get [<remote>:][container] <key>\n"
+"    Get container or server configuration key.\n"
+"\n"
+"lxc config set [<remote>:][container] <key> <value>\n"
+"    Set container or server configuration key.\n"
+"\n"
+"lxc config unset [<remote>:][container] <key>\n"
+"    Unset container or server configuration key.\n"
+"\n"
+"lxc config show [<remote>:][container] [--expanded]\n"
+"    Show container or server configuration.\n"
+"\n"
+"lxc config edit [<remote>:][container]\n"
 "    Edit configuration, either by launching external editor or reading "
 "STDIN.\n"
-"    Example: lxc config edit <container> # launch editor\n"
-"             cat config.yaml | lxc config edit <container> # read from "
-"config.yaml\n"
-"\n"
-"lxc config trust list "
-"[<remote>:]                                             List all trusted "
-"certs.\n"
-"lxc config trust add [<remote>:] <certfile."
-"crt>                               Add certfile.crt to trusted hosts.\n"
-"lxc config trust remove [<remote>:] [hostname|"
-"fingerprint]                    Remove the cert from trusted hosts.\n"
 "\n"
-"Examples:\n"
-"To mount host's /share/c1 onto /opt in the container:\n"
-"    lxc config device add [<remote>:]container1 <device-name> disk source=/"
-"share/c1 path=opt\n"
+"*Device management*\n"
 "\n"
-"To set an lxc config value:\n"
-"    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = "
-"1'\n"
+"lxc config device add [<remote>:]<container> <device> <type> [key=value...]\n"
+"    Add a device to a container.\n"
 "\n"
-"To listen on IPv4 and IPv6 port 8443 (you can omit the 8443 its the "
-"default):\n"
-"    lxc config set core.https_address [::]:8443\n"
+"lxc config device get [<remote>:]<container> <device> <key>\n"
+"    Get a device property.\n"
 "\n"
-"To set the server trust password:\n"
-"    lxc config set core.trust_password blah"
+"lxc config device set [<remote>:]<container> <device> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc config device unset [<remote>:]<container> <device> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc config device list [<remote>:]<container>\n"
+"    List devices for container.\n"
+"\n"
+"lxc config device show [<remote>:]<container>\n"
+"    Show full device details for container.\n"
+"\n"
+"lxc config device remove [<remote>:]<container> <name>\n"
+"    Remove device from container.\n"
+"\n"
+"*Client trust store management*\n"
+"\n"
+"lxc config trust list [<remote>:]\n"
+"    List all trusted certs.\n"
+"\n"
+"lxc config trust add [<remote>:] <certfile.crt>\n"
+"    Add certfile.crt to trusted hosts.\n"
+"\n"
+"lxc config trust remove [<remote>:] [hostname|fingerprint]\n"
+"    Remove the cert from trusted hosts.\n"
+"\n"
+"*Examples*\n"
+"\n"
+"cat config.yaml | lxc config edit <container>\n"
+"    Update the container configuration from config.yaml.\n"
+"\n"
+"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the container.\n"
+"\n"
+"lxc config set [<remote>:]<container> limits.cpu 2\n"
+"    Will set a CPU limit of \"2\" for the container.\n"
+"\n"
+"lxc config set core.https_address [::]:8443\n"
+"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"\n"
+"lxc config set core.trust_password blah\n"
+"    Will set the server's trust password to blah."
 msgstr ""
 "設定を管理します。\n"
 "\n"
@@ -1039,29 +1193,86 @@ msgstr ""
 "(8443 はデフォルトなので省略できます):\n"
 "    lxc config set core.https_address [::]:8443\n"
 "\n"
-"サーバのパスワードを設定するには:\n"
-"    lxc config set core.trust_password blah"
+"サーバのパスワードを設定するには:\n"
+"    lxc config set core.trust_password blah"
+
+#: lxc/copy.go:25
+#, fuzzy
+msgid ""
+"Usage: lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] "
+"[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]\n"
+"\n"
+"Copy containers within or in between LXD instances."
+msgstr ""
+"LXDインスタンス内もしくはLXDインスタンス間でコンテナをコピーします。\n"
+"\n"
+"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>]\n"
+"[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
+
+#: lxc/delete.go:26
+#, fuzzy
+msgid ""
+"Usage: lxc delete [<remote>:]<container>[/<snapshot>] "
+"[[<remote>:]<container>[/<snapshot>]...]\n"
+"\n"
+"Delete containers and snapshots."
+msgstr ""
+"コンテナもしくはコンテナのスナップショットを消去します。\n"
+"\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
+"<snapshot>]...]\n"
+"\n"
+"付属するデータ (設定、スナップショット、...) と一緒にコンテナもしくはコンテ\n"
+"ナのスナップショットを消去します。"
+
+#: lxc/exec.go:46
+#, fuzzy
+msgid ""
+"Usage: lxc exec [<remote>:]<container> [--mode=auto|interactive|non-"
+"interactive] [--env KEY=VALUE...] [--] <command line>\n"
+"\n"
+"Execute commands in containers.\n"
+"\n"
+"Mode defaults to non-interactive, interactive mode is selected if both stdin "
+"AND stdout are terminals (stderr is ignored)."
+msgstr ""
+"指定したコマンドをコンテナ内で実行します。\n"
+"\n"
+"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
+"env KEY=VALUE...] [--] <command line>\n"
+"\n"
+"デフォルトのモードは non-interactive です。もし標準入出力が両方ともターミナ\n"
+"ルの場合は interactive モードが選択されます (標準エラー出力は無視されます)。"
 
 #: lxc/file.go:36
+#, fuzzy
 msgid ""
-"Manage files in a container.\n"
+"Usage: lxc file <subcommand> [options]\n"
+"\n"
+"Manage files in containers.\n"
+"\n"
+"lxc file pull [-r|--recursive] [<remote>:]<container>/<path> "
+"[[<remote>:]<container>/<path>...] <target path>\n"
+"    Pull files from containers.\n"
 "\n"
-"lxc file pull [-r|--recursive] [<remote>:]<container> "
-"[[<remote>:]<container>...] <target path>\n"
 "lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
-"mode=MODE] <source path> [<source path>...] [<remote>:]<container>\n"
-"lxc file delete [<remote>:]<container> [[<remote>:]<container>...]\n"
-"lxc file edit [<remote>:]<container>/<path>\n"
+"mode=MODE] <source path> [<source path>...] [<remote>:]<container>/<path>\n"
+"    Push files into containers.\n"
 "\n"
-"<source> in the case of pull, <target> in the case of push and <file> in the "
-"case of edit are <container name>/<path>\n"
+"lxc file delete [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"<path>...]\n"
+"    Delete files in containers.\n"
 "\n"
-"Examples:\n"
-"To push /etc/hosts into the container foo:\n"
-"    lxc file push /etc/hosts foo/etc/hosts\n"
+"lxc file edit [<remote>:]<container>/<path>\n"
+"    Edit files in containers using the default text editor.\n"
 "\n"
-"To pull /etc/hosts from the container:\n"
-"    lxc file pull foo/etc/hosts ."
+"*Examples*\n"
+"lxc file push /etc/hosts foo/etc/hosts\n"
+"   To push /etc/hosts into the container \"foo\".\n"
+"\n"
+"lxc file pull foo/etc/hosts .\n"
+"   To pull /etc/hosts from the container and write it to the current "
+"directory."
 msgstr ""
 "コンテナ内のファイルを管理します。\n"
 "\n"
@@ -1083,179 +1294,25 @@ msgstr ""
 "/etc/hosts をコンテナから pull するには:\n"
 "    lxc file pull foo/etc/hosts ."
 
-#: lxc/network.go:49
-msgid ""
-"Manage networks.\n"
-"\n"
-"lxc network list [<remote>:]                              List available "
-"networks.\n"
-"lxc network show [<remote>:]<network>                     Show details of a "
-"network.\n"
-"lxc network create [<remote>:]<network> [key=value...]    Create a network.\n"
-"lxc network get [<remote>:]<network> <key>                Get network "
-"configuration.\n"
-"lxc network set [<remote>:]<network> <key> <value>        Set network "
-"configuration.\n"
-"lxc network unset [<remote>:]<network> <key>              Unset network "
-"configuration.\n"
-"lxc network delete [<remote>:]<network>                   Delete a network.\n"
-"lxc network edit [<remote>:]<network>\n"
-"    Edit network, either by launching external editor or reading STDIN.\n"
-"    Example: lxc network edit <network> # launch editor\n"
-"             cat network.yaml | lxc network edit <network> # read from "
-"network.yaml\n"
-"\n"
-"lxc network attach [<remote>:]<network> <container> [device name] [interface "
-"name]\n"
-"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
-"[interface name]\n"
-"\n"
-"lxc network detach [<remote>:]<network> <container> [device name]\n"
-"lxc network detach-profile [<remote>:]<network> <container> [device name]"
-msgstr ""
-"ネットワークを管理します。<\n"
-"\n"
-"lxc network list [<remote>:]                           利用できるネットワーク"
-"を一覧します\n"
-"lxc network show [<remote>:]<network>                  ネットワークの詳細を表"
-"示します\n"
-"lxc network create [<remote>:]<network> [key=value...] ネットワークを作成しま"
-"す\n"
-"lxc network get [<remote>:]<network> <key>             ネットワークの設定を取"
-"得します\n"
-"lxc network set [<remote>:]<network> <key> <value>     ネットワークを設定しま"
-"す\n"
-"lxc network unset [<remote>:]<network> <key>           ネットワークの設定を削"
-"除します\n"
-"lxc network delete [<remote>:]<network>                ネットワークを削除しま"
-"す\n"
-"lxc network edit [<remote>:]<network>\n"
-"    ネットワークを編集します。外部エディタもしくはSTDINから読み込みます。\n"
-"    例: lxc network edit <network> # エディタの起動\n"
-"        cat network.yaml | lxc network edit <network> # network.yaml から読み"
-"込み\n"
-"\n"
-"lxc network attach [<remote>:]<network> <container> [device name] [interface "
-"name]\n"
-"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
-"[interface name]\n"
-"\n"
-"lxc network detach [<remote>:]<network> <container> [device name]\n"
-"lxc network detach-profile [<remote>:]<network> <container> [device name]"
-
-#: lxc/remote.go:37
+#: lxc/finger.go:15
 msgid ""
-"Manage remote LXD servers.\n"
+"Usage: lxc finger [<remote>:]\n"
 "\n"
-"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
-"password=PASSWORD]\n"
-"                                        [--public] [--protocol=PROTOCOL]    "
-"Add the remote <remote> at <url>.\n"
-"lxc remote remove <remote>                                                  "
-"Remove the remote <remote>.\n"
-"lxc remote list                                                             "
-"List all remotes.\n"
-"lxc remote rename <old name> <new name>                                     "
-"Rename remote <old name> to <new name>.\n"
-"lxc remote set-url <remote> <url>                                           "
-"Update <remote>'s url to <url>.\n"
-"lxc remote set-default <remote>                                             "
-"Set the default remote.\n"
-"lxc remote get-default                                                      "
-"Print the default remote."
+"Check if the LXD server is alive."
 msgstr ""
-"リモートの LXD サーバを管理します。\n"
-"\n"
-"lxc remote add [<remote>] <IP|FQDN|URL>\n"
-"    [--accept-certificate] [--password=PASSWORD]\n"
-"    [--public] [--protocol=PROTOCOL]\n"
-"    <url> をリモートホスト <remote> として追加します。\n"
-"lxc remote remove <remote>\n"
-"    リモートホスト <remote> を削除します。\n"
-"lxc remote list\n"
-"    登録済みのリモートホストを全て一覧表示します。\n"
-"lxc remote rename <old name> <new name>\n"
-"    リモートホストの名前を <old name> から <new name> に変更します。\n"
-"lxc remote set-url <remote> <url>\n"
-"    <remote> の url を <url> に更新します。\n"
-"lxc remote set-default <remote>\n"
-"    <remote> をデフォルトのリモートホストに設定します。\n"
-"lxc remote get-default\n"
-"    デフォルトに設定されているリモートホストを表示します。"
 
-#: lxc/storage.go:61
+#: lxc/help.go:22
 msgid ""
-"Manage storage.\n"
-"\n"
-"lxc storage list [<remote>:]                                    List "
-"available storage pools.\n"
-"lxc storage show [<remote>:]<pool>                              Show details "
-"of a storage pool.\n"
-"lxc storage create [<remote>:]<pool> <driver> [key=value]...    Create a "
-"storage pool.\n"
-"lxc storage get [<remote>:]<pool> <key>                         Get storage "
-"pool configuration.\n"
-"lxc storage set [<remote>:]<pool> <key> <value>                 Set storage "
-"pool configuration.\n"
-"lxc storage unset [<remote>:]<pool> <key>                       Unset "
-"storage pool configuration.\n"
-"lxc storage delete [<remote>:]<pool>                            Delete a "
-"storage pool.\n"
-"lxc storage edit [<remote>:]<pool>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage edit [<remote>:]<pool> # launch editor\n"
-"             cat pool.yaml | lxc storage edit [<remote>:]<pool> # read from "
-"pool.yaml\n"
-"\n"
-"lxc storage volume list [<remote>:]<pool>                              List "
-"available storage volumes on a storage pool.\n"
-"lxc storage volume show [<remote>:]<pool> <volume>                     Show "
-"details of a storage volume on a storage pool.\n"
-"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...    "
-"Create a storage volume on a storage pool.\n"
-"lxc storage volume get [<remote>:]<pool> <volume> <key>                Get "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>        Set "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume unset [<remote>:]<pool> <volume> <key>              Unset "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume delete [<remote>:]<pool> <volume>                   "
-"Delete a storage volume on a storage pool.\n"
-"lxc storage volume edit [<remote>:]<pool> <volume>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage volume edit [<remote>:]<pool> <volume> # launch "
-"editor\n"
-"             cat pool.yaml | lxc storage volume edit [<remote>:]<pool> "
-"<volume> # read from pool.yaml\n"
-"\n"
-"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
-"name] <path>\n"
-"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name] <path>\n"
-"\n"
-"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
-"name]\n"
-"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name]\n"
-"\n"
-"\n"
-"Unless specified through a prefix, all volume operations affect \"custom"
-"\" (user created) volumes.\n"
-"\n"
-"Examples:\n"
-"To show the properties of a custom volume called \"data\" in the \"default\" "
-"pool:\n"
-"    lxc storage volume show default data\n"
+"Usage: lxc help [--all]\n"
 "\n"
-"To show the properties of the filesystem for a container called \"data\" in "
-"the \"default\" pool:\n"
-"    lxc storage volume show default container/data\n"
+"Help page for the LXD client."
 msgstr ""
 
 #: lxc/image.go:62
+#, fuzzy
 msgid ""
+"Usage: lxc image <subcommand> [options]\n"
+"\n"
 "Manipulate container images.\n"
 "\n"
 "In LXD containers are created from images. Those images were themselves\n"
@@ -1387,46 +1444,254 @@ msgstr ""
 "    例: lxc image edit <image> # エディタの起動\n"
 "        cat image.yaml | lxc image edit <image> # image.yaml から読み込み\n"
 "\n"
-"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
-"    既存のイメージに新たにエイリアスを作成します。\n"
+"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
+"    既存のイメージに新たにエイリアスを作成します。\n"
+"\n"
+"lxc image alias delete [<remote>:]<alias>\n"
+"    エイリアスを削除します。\n"
+"\n"
+"lxc image alias list [<remote>:] [filter]\n"
+"    エイリアスを一覧表示します。イメージハッシュの一部やイメージのエイリア"
+"ス\n"
+"    名の一部をフィルタとして指定できます。"
+
+#: lxc/info.go:25
+msgid ""
+"Usage: lxc info [<remote>:][<container>] [--show-log]\n"
+"\n"
+"Show container or server information.\n"
+"\n"
+"lxc info [<remote>:]<container> [--show-log]\n"
+"    For container information.\n"
+"\n"
+"lxc info [<remote>:]\n"
+"    For LXD server information."
+msgstr ""
+
+#: lxc/init.go:75
+#, fuzzy
+msgid ""
+"Usage: lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc init ubuntu:16.04 u1"
+msgstr ""
+"指定したイメージからコンテナを初期化します。\n"
+"\n"
+"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
+"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--"
+"storage|-s <pool>]\n"
+"\n"
+"指定したイメージとコンテナ名を使ってコンテナを初期化します。\n"
+"\n"
+"-p を指定しない場合はデフォルトのプロファイルを使います。\n"
+"\"-p\" のように引数なしで -p を使うとプロファイルなしとなります。\n"
+"\n"
+"例:\n"
+"    lxc init ubuntu:16.04 u1"
+
+#: lxc/launch.go:23
+#, fuzzy
+msgid ""
+"Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create and start containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc launch ubuntu:16.04 u1"
+msgstr ""
+"指定したイメージからコンテナを起動します。\n"
+"\n"
+"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"指定したイメージと名前を使ってコンテナを起動します。\n"
+"\n"
+"-p を指定しない場合はデフォルトのプロファイルを使います。\n"
+"\"-p\" のように引数なしで -p を使うとプロファイルなしとなります。\n"
+"\n"
+"例:\n"
+"    lxc launch ubuntu:16.04 u1"
+
+#: lxc/list.go:47
+#, fuzzy
+msgid ""
+"Usage: lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] "
+"[--fast]\n"
+"\n"
+"List the existing containers.\n"
+"\n"
+"Default column layout: ns46tS\n"
+"Fast column layout: nsacPt\n"
+"\n"
+"*Filters*\n"
+"A single keyword like \"web\" which will list any container with a name "
+"starting by \"web\".\n"
+"\n"
+"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"\n"
+"A key/value pair referring to a configuration item. For those, the namespace "
+"can be abbreviated to the smallest unambiguous identifier.\n"
+"    - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"property set to \"abc\".\n"
+"\n"
+"    - \"u.blah=abc\" will do the same\n"
+"\n"
+"    - \"security.privileged=1\" will list all privileged containers\n"
+"\n"
+"    - \"s.privileged=1\" will do the same\n"
+"\n"
+"A regular expression matching a configuration item or its value. (e.g. "
+"volatile.eth0.hwaddr=00:16:3e:.*).\n"
+"\n"
+"*Columns*\n"
+"The -c option takes a comma separated list of arguments that control\n"
+"which container attributes to output when displaying in table format.\n"
+"\n"
+"Column arguments are either pre-defined shorthand chars (see below),\n"
+"or (extended) config keys.\n"
+"\n"
+"Commas between consecutive shorthand chars are optional.\n"
+"\n"
+"Pre-defined column shorthand chars:\n"
+"\n"
+"    4 - IPv4 address\n"
+"\n"
+"    6 - IPv6 address\n"
+"\n"
+"    a - Architecture\n"
+"\n"
+"    b - Storage pool\n"
+"\n"
+"    c - Creation date\n"
+"\n"
+"    l - Last used date\n"
+"\n"
+"    n - Name\n"
+"\n"
+"    p - PID of the container's init process\n"
+"\n"
+"    P - Profiles\n"
+"\n"
+"    s - State\n"
+"\n"
+"    S - Number of snapshots\n"
+"\n"
+"    t - Type (persistent or ephemeral)\n"
+"\n"
+"Custom columns are defined with \"key[:name][:maxWidth]\":\n"
+"\n"
+"    KEY: The (extended) config key to display\n"
+"\n"
+"    NAME: Name to display in the column header.\n"
+"    Defaults to the key if not specified or empty.\n"
+"\n"
+"    MAXWIDTH: Max width of the column (longer results are truncated).\n"
+"    Defaults to -1 (unlimited). Use 0 to limit to the column header size.\n"
+"\n"
+"*Examples*\n"
+"lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:"
+"MAC\n"
+"    Shows a list of containers using the \"NAME\", \"BASE IMAGE\", \"STATE"
+"\", \"IPV4\",\n"
+"    \"IPV6\" and \"MAC\" columns.\n"
+"\n"
+"    \"BASE IMAGE\" and \"MAC\" are custom columns generated from container "
+"configuration keys."
+msgstr ""
+"コンテナを一覧表示します。\n"
+"\n"
+"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
+"fast]\n"
+"\n"
+"フィルタの指定:\n"
+"* 単一の \"web\" のようなキーワードを指定すると、名前が \"web\" ではじまるコ"
+"ンテ\n"
+"  ナが一覧表示されます。\n"
+"* コンテナ名の正規表現 (例: .*web.*01$)\n"
+"* 設定項目のキーと値。キーの名前空間は一意に識別できる場合は短縮することが"
+"で\n"
+"  きます:\n"
+" * \"user.blah=abc\" は \"blah\" という user プロパティが \"abc\" に設定され"
+"ている\n"
+"  コンテナをすべて一覧表示します。\n"
+" * \"u.blah=abc\" は上記と同じ意味になります。\n"
+" * \"security.privileged=1\" は特権コンテナをすべて一覧表示します。\n"
+" * \"s.privilaged=1\" は上記と同じ意味になります。\n"
+" * 設定項目もしくは値とマッチする正規表現\n"
+"   (例:volatile.eth0.hwaddr=00:16:3e:.*)\n"
+"\n"
+"-c オプションには、表形式で表示する際にどのコンテナの属性を表示するか\n"
+"を指定するコンマ区切りのリストを指定します。カラムの指定は、定義済みの\n"
+"短縮形 (以下を参照) もしくは (拡張された) 設定キーのどちらかを指定しま\n"
+"す。連続する短縮形の間のコンマは省略できます。\n"
+"\n"
+"短縮形で指定できる文字:\n"
+"* 4 - IPv4 アドレス\n"
+"* 6 - IPv6 アドレス\n"
+"* a - アーキテクチャ\n"
+"* b - ストレージプール\n"
+"* c - 作成日\n"
+"* l - 最終使用日\n"
+"* n - 名前\n"
+"* p - コンテナの init プロセスの pid\n"
+"* P - プロファイル\n"
+"* s - 状態\n"
+"* S - スナップショットの数\n"
+"* t - タイプ (persistent or ephemeral)\n"
+"\n"
+"設定キーの文法: key[:name][:maxWidth]\n"
+"* key      - 表示する (拡張された) 設定キー\n"
+"* name     - カラムのヘッダに表示する名前。指定しない場合、もしくは空\n"
+"             の場合のデフォルトはキー。\n"
+"             (名前を指定せずに maxWidth を指定できます。例: user.key::0)\n"
+"* maxWidth - カラムの最大幅 (結果がこれより長い場合は切り詰められます)\n"
+"             -1 == 制限なし\n"
+"              0 == カラムヘッダの幅\n"
+"             >0 == 文字列の最大幅\n"
+"             デフォルトは -1 (制限なし)\n"
 "\n"
-"lxc image alias delete [<remote>:]<alias>\n"
-"    エイリアスを削除します。\n"
+"デフォルトのカラムレイアウト: ns46tS\n"
+"Fast モードのカラムレイアウト: nsacPt\n"
 "\n"
-"lxc image alias list [<remote>:] [filter]\n"
-"    エイリアスを一覧表示します。イメージハッシュの一部やイメージのエイリア"
-"ス\n"
-"    名の一部をフィルタとして指定できます。"
-
-#: lxc/info.go:161
-msgid "Memory (current)"
-msgstr "メモリ (現在値)"
-
-#: lxc/info.go:165
-msgid "Memory (peak)"
-msgstr "メモリ (ピーク)"
-
-#: lxc/info.go:177
-msgid "Memory usage:"
-msgstr "メモリ消費量:"
+"例:\n"
+"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
+"hwaddr:MAC"
 
-#: lxc/help.go:87
-msgid "Missing summary."
-msgstr "サマリーはありません。"
+#: lxc/manpage.go:20
+msgid ""
+"Usage: lxc manpage <directory>\n"
+"\n"
+"Generate all the LXD manpages."
+msgstr ""
 
 #: lxc/monitor.go:41
+#, fuzzy
 msgid ""
-"Monitor activity on the LXD server.\n"
+"Usage: lxc monitor [<remote>:] [--type=TYPE...]\n"
 "\n"
-"lxc monitor [<remote>:] [--type=TYPE...]\n"
+"Monitor a local or remote LXD server.\n"
 "\n"
-"Connects to the monitoring interface of the specified LXD server.\n"
+"By default the monitor will listen to all message types.\n"
 "\n"
-"By default will listen to all message types.\n"
-"Specific types to listen to can be specified with --type.\n"
+"Message types to listen for can be specified with --type.\n"
 "\n"
-"Example:\n"
-"    lxc monitor --type=logging"
+"*Examples*\n"
+"lxc monitor --type=logging\n"
+"    Only show log message."
 msgstr ""
 "LXD サーバの動作をモニタリングします。\n"
 "\n"
@@ -1440,19 +1705,13 @@ msgstr ""
 "例:\n"
 "    lxc monitor --type=logging"
 
-#: lxc/network.go:224 lxc/network.go:273 lxc/storage.go:324 lxc/storage.go:424
-msgid "More than one device matches, specify the device name."
-msgstr "複数のデバイスとマッチします。デバイス名を指定してください。"
-
-#: lxc/file.go:274
-msgid "More than one file to download, but target is not a directory"
-msgstr ""
-"ダウンロード対象のファイルが複数ありますが、コピー先がディレクトリではありま"
-"せん"
-
 #: lxc/move.go:16
+#, fuzzy
 msgid ""
-"Move containers within or in between lxd instances.\n"
+"Usage: lxc move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]]\n"
+"\n"
+"Move containers within or in between LXD instances.\n"
 "\n"
 "lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
 "    Move a container between two hosts, renaming it if destination name "
@@ -1476,580 +1735,478 @@ msgstr ""
 "lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
 "    スナップショットをリネームします。"
 
-#: lxc/action.go:67
-msgid "Must supply container name for: "
-msgstr "コンテナ名を指定する必要があります: "
-
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
-#: lxc/storage.go:569 lxc/storage.go:649
-msgid "NAME"
-msgstr ""
-
-#: lxc/network.go:420 lxc/remote.go:354 lxc/remote.go:359
-msgid "NO"
-msgstr ""
-
-#: lxc/info.go:89
-#, c-format
-msgid "Name: %s"
-msgstr "コンテナ名: %s"
-
-#: lxc/network.go:198
-#, c-format
-msgid "Network %s created"
-msgstr "ネットワーク %s を作成しました"
-
-#: lxc/network.go:301
-#, c-format
-msgid "Network %s deleted"
-msgstr "ネットワーク %s を削除しました"
-
-#: lxc/init.go:143 lxc/init.go:144
-msgid "Network name"
-msgstr "ネットワーク名:"
-
-#: lxc/info.go:194
-msgid "Network usage:"
-msgstr "ネットワーク使用状況:"
-
-#: lxc/image.go:134 lxc/publish.go:35
-msgid "New alias to define at target"
-msgstr "新しいエイリアスを定義する"
-
-#: lxc/config.go:285
-msgid "No certificate provided to add"
-msgstr "追加すべき証明書が提供されていません"
-
-#: lxc/network.go:233 lxc/network.go:282
-msgid "No device found for this network"
-msgstr "このネットワークに対するデバイスがありません"
-
-#: lxc/storage.go:333 lxc/storage.go:433
-msgid "No device found for this storage volume."
-msgstr "このストレージボリュームに対するデバイスがありません。"
-
-#: lxc/config.go:308
-msgid "No fingerprint specified."
-msgstr "フィンガープリントが指定されていません。"
-
-#: lxc/storage.go:285 lxc/storage.go:369
-msgid "Only \"custom\" volumes can be attached to containers."
-msgstr "\"カスタム\" のボリュームのみがコンテナにアタッチできます。"
-
-#: lxc/remote.go:120
-msgid "Only https URLs are supported for simplestreams"
-msgstr "simplestreams は https の URL のみサポートします"
-
-#: lxc/image.go:396
-msgid "Only https:// is supported for remote image import."
-msgstr "リモートイメージのインポートは https:// のみをサポートします。"
-
-#: lxc/network.go:330 lxc/network.go:457
-msgid "Only managed networks can be modified."
-msgstr "管理対象のネットワークのみ変更できます。"
-
-#: lxc/help.go:63 lxc/main.go:112
-msgid "Options:"
-msgstr "オプション:"
-
-#: lxc/image.go:507
-#, c-format
-msgid "Output is in %s"
-msgstr "%s に出力されます"
-
-#: lxc/exec.go:56
-msgid "Override the terminal mode (auto, interactive or non-interactive)"
-msgstr "ターミナルモードを上書きします (auto, interactive, non-interactive)"
-
-#: lxc/list.go:556
-msgid "PERSISTENT"
-msgstr ""
-
-#: lxc/list.go:410
-msgid "PID"
-msgstr "PID"
-
-#: lxc/list.go:411
-msgid "PROFILES"
-msgstr ""
-
-#: lxc/remote.go:382
-msgid "PROTOCOL"
-msgstr ""
-
-#: lxc/image.go:609 lxc/remote.go:383
-msgid "PUBLIC"
-msgstr ""
-
-#: lxc/info.go:188
-msgid "Packets received"
-msgstr "受信パケット"
-
-#: lxc/info.go:189
-msgid "Packets sent"
-msgstr "送信パケット"
-
-#: lxc/help.go:70
-msgid "Path to an alternate client configuration directory"
-msgstr "別のクライアント用設定ディレクトリ"
-
-#: lxc/help.go:71
-msgid "Path to an alternate server directory"
-msgstr "別のサーバ用設定ディレクトリ"
-
-#: lxc/main.go:31
-msgid "Permission denied, are you in the lxd group?"
-msgstr "アクセスが拒否されました。lxd グループに所属していますか?"
-
-#: lxc/info.go:106
-#, c-format
-msgid "Pid: %d"
-msgstr "Pid: %d"
-
-#: lxc/network.go:355 lxc/profile.go:219 lxc/storage.go:498 lxc/storage.go:803
-msgid "Press enter to open the editor again"
-msgstr "再度エディタを開くためには Enter キーを押します"
-
-#: lxc/config.go:536 lxc/config.go:601 lxc/image.go:704
-msgid "Press enter to start the editor again"
-msgstr "再度エディタを起動するには Enter キーを押します"
-
-#: lxc/manpage.go:18
-msgid "Print all the subcommands help."
-msgstr "全てのサブコマンドのヘルプを表示します。"
-
-#: lxc/help.go:65
-msgid "Print debug information"
-msgstr "デバッグ情報を表示します"
-
-#: lxc/help.go:64
-msgid "Print less common commands"
-msgstr "全てのコマンドを表示します (主なコマンドだけではなく)"
-
-#: lxc/help.go:66
-msgid "Print verbose information"
-msgstr "詳細情報を表示します"
-
-#: lxc/version.go:18
+#: lxc/network.go:49
+#, fuzzy
 msgid ""
-"Prints the version number of this client tool.\n"
+"Usage: lxc network <subcommand> [options]\n"
 "\n"
-"lxc version"
+"Manage and attach containers to networks.\n"
+"\n"
+"lxc network list [<remote>:]\n"
+"    List available networks.\n"
+"\n"
+"lxc network show [<remote>:]<network>\n"
+"    Show details of a network.\n"
+"\n"
+"lxc network create [<remote>:]<network> [key=value...]\n"
+"    Create a network.\n"
+"\n"
+"lxc network get [<remote>:]<network> <key>\n"
+"    Get network configuration.\n"
+"\n"
+"lxc network set [<remote>:]<network> <key> <value>\n"
+"    Set network configuration.\n"
+"\n"
+"lxc network unset [<remote>:]<network> <key>\n"
+"    Unset network configuration.\n"
+"\n"
+"lxc network delete [<remote>:]<network>\n"
+"    Delete a network.\n"
+"\n"
+"lxc network edit [<remote>:]<network>\n"
+"    Edit network, either by launching external editor or reading STDIN.\n"
+"\n"
+"lxc network attach [<remote>:]<network> <container> [device name] [interface "
+"name]\n"
+"    Attach a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
+"[interface name]\n"
+"    Attach a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"*Examples*\n"
+"cat network.yaml | lxc network edit <network>\n"
+"    Update a network using the content of network.yaml"
 msgstr ""
-"お使いのクライアントのバージョン番号を表示します。\n"
+"ネットワークを管理します。<\n"
 "\n"
-"lxc version"
-
-#: lxc/info.go:130
-#, c-format
-msgid "Processes: %d"
-msgstr "プロセス数: %d"
-
-#: lxc/profile.go:275
-#, c-format
-msgid "Profile %s added to %s"
-msgstr "プロファイル %s が %s に追加されました"
-
-#: lxc/profile.go:170
-#, c-format
-msgid "Profile %s created"
-msgstr "プロファイル %s を作成しました"
-
-#: lxc/profile.go:240
-#, c-format
-msgid "Profile %s deleted"
-msgstr "プロファイル %s を削除しました"
-
-#: lxc/profile.go:306
-#, c-format
-msgid "Profile %s removed from %s"
-msgstr "プロファイル %s が %s から削除されました"
-
-#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:139 lxc/init.go:140
-msgid "Profile to apply to the new container"
-msgstr "新しいコンテナに適用するプロファイル"
-
-#: lxc/profile.go:256
-#, c-format
-msgid "Profiles %s applied to %s"
-msgstr "プロファイル %s が %s に追加されました"
-
-#: lxc/info.go:104
-#, c-format
-msgid "Profiles: %s"
-msgstr "プロファイル: %s"
-
-#: lxc/image.go:330
-msgid "Properties:"
-msgstr "プロパティ:"
-
-#: lxc/remote.go:54
-msgid "Public image server"
-msgstr "Public なイメージサーバとして設定します"
-
-#: lxc/image.go:313
-#, c-format
-msgid "Public: %s"
-msgstr "パブリック: %s"
-
-#: lxc/publish.go:27
-msgid ""
-"Publish containers as images.\n"
+"lxc network list [<remote>:]                           利用できるネットワーク"
+"を一覧します\n"
+"lxc network show [<remote>:]<network>                  ネットワークの詳細を表"
+"示します\n"
+"lxc network create [<remote>:]<network> [key=value...] ネットワークを作成しま"
+"す\n"
+"lxc network get [<remote>:]<network> <key>             ネットワークの設定を取"
+"得します\n"
+"lxc network set [<remote>:]<network> <key> <value>     ネットワークを設定しま"
+"す\n"
+"lxc network unset [<remote>:]<network> <key>           ネットワークの設定を削"
+"除します\n"
+"lxc network delete [<remote>:]<network>                ネットワークを削除しま"
+"す\n"
+"lxc network edit [<remote>:]<network>\n"
+"    ネットワークを編集します。外部エディタもしくはSTDINから読み込みます。\n"
+"    例: lxc network edit <network> # エディタの起動\n"
+"        cat network.yaml | lxc network edit <network> # network.yaml から読み"
+"込み\n"
 "\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
-msgstr ""
-"イメージとしてコンテナを publish します。\n"
+"lxc network attach [<remote>:]<network> <container> [device name] [interface "
+"name]\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
+"[interface name]\n"
 "\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
-
-#: lxc/file.go:58 lxc/file.go:59
-msgid "Recursively push or pull files"
-msgstr "再帰的にファイルをpush/pullします"
-
-#: lxc/remote.go:52
-msgid "Remote admin password"
-msgstr "リモートの管理者パスワード"
-
-#: lxc/info.go:91
-#, c-format
-msgid "Remote: %s"
-msgstr "リモート名: %s"
-
-#: lxc/delete.go:43
-#, c-format
-msgid "Remove %s (yes/no): "
-msgstr "%s を消去しますか (yes/no): "
-
-#: lxc/delete.go:37 lxc/delete.go:38
-msgid "Require user confirmation"
-msgstr "ユーザの確認を要求する"
-
-#: lxc/info.go:127
-msgid "Resources:"
-msgstr "リソース:"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]"
 
-#: lxc/restore.go:21
+#: lxc/profile.go:49
+#, fuzzy
 msgid ""
-"Restore a container's state to a previous snapshot.\n"
+"Usage: lxc profile <subcommand> [options]\n"
 "\n"
-"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"Manage container configuration profiles.\n"
 "\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
+"*Profile configuration*\n"
+"lxc profile list [<remote>:]\n"
+"    List available profiles.\n"
 "\n"
-"Examples:\n"
-"Create the snapshot:\n"
-"    lxc snapshot u1 snap0\n"
+"lxc profile show [<remote>:]<profile>\n"
+"    Show details of a profile.\n"
 "\n"
-"Restore the snapshot:\n"
-"    lxc restore u1 snap0"
-msgstr ""
-"リソースの現在の状態をスナップショット時点の状態に設定します。\n"
+"lxc profile create [<remote>:]<profile>\n"
+"    Create a profile.\n"
 "\n"
-"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
+"    Copy the profile.\n"
 "\n"
-"スナップショットからコンテナをリストアします (オプションで実行状態もリスト\n"
-"アします。詳しくはスナップショットのヘルプをご覧ください)。\n"
+"lxc profile get [<remote>:]<profile> <key>\n"
+"    Get profile configuration.\n"
 "\n"
-"例:\n"
-"スナップショットの作成:\n"
-"    lxc snapshot u1 snap0\n"
-"スナップショットからのリストア:\n"
-"    lxc restore u1 snap0"
-
-#: lxc/init.go:256
-#, c-format
-msgid "Retrieving image: %s"
-msgstr "イメージの取得中: %s"
-
-#: lxc/image.go:612
-msgid "SIZE"
-msgstr ""
-
-#: lxc/list.go:412
-msgid "SNAPSHOTS"
-msgstr ""
-
-#: lxc/storage.go:571
-msgid "SOURCE"
-msgstr ""
-
-#: lxc/list.go:413
-msgid "STATE"
-msgstr ""
-
-#: lxc/remote.go:384
-msgid "STATIC"
-msgstr ""
-
-#: lxc/list.go:415
-msgid "STORAGE POOL"
-msgstr ""
-
-#: lxc/remote.go:225
-msgid "Server certificate NACKed by user"
-msgstr "ユーザによりサーバ証明書が拒否されました"
-
-#: lxc/remote.go:287
-msgid "Server doesn't trust us after adding our cert"
-msgstr "サーバが我々の証明書を追加した後我々を信頼していません"
-
-#: lxc/remote.go:53
-msgid "Server protocol (lxd or simplestreams)"
-msgstr "サーバのプロトコル (lxd or simplestreams)"
-
-#: lxc/file.go:56
-msgid "Set the file's gid on push"
-msgstr "プッシュ時にファイルのgidを設定します"
-
-#: lxc/file.go:57
-msgid "Set the file's perms on push"
-msgstr "プッシュ時にファイルのパーミションを設定します"
-
-#: lxc/file.go:55
-msgid "Set the file's uid on push"
-msgstr "プッシュ時にファイルのuidを設定します"
-
-#: lxc/help.go:32
-msgid "Show all commands (not just interesting ones)"
-msgstr "全てコマンドを表示します (主なコマンドだけではなく)"
-
-#: lxc/help.go:67
-msgid "Show client version"
-msgstr "クライアントのバージョンを表示します"
-
-#: lxc/info.go:36
-msgid "Show the container's last 100 log lines?"
-msgstr "コンテナログの最後の 100 行を表示しますか?"
-
-#: lxc/config.go:33
-msgid "Show the expanded configuration"
-msgstr "拡張した設定を表示する"
-
-#: lxc/image.go:311
-#, c-format
-msgid "Size: %.2fMB"
-msgstr "サイズ: %.2fMB"
-
-#: lxc/info.go:208
-msgid "Snapshots:"
-msgstr "スナップショット:"
-
-#: lxc/action.go:133
-#, c-format
-msgid "Some containers failed to %s"
-msgstr "一部のコンテナで %s が失敗しました"
-
-#: lxc/image.go:340
-msgid "Source:"
-msgstr "取得元:"
-
-#: lxc/launch.go:148
-#, c-format
-msgid "Starting %s"
-msgstr "%s を起動中"
-
-#: lxc/info.go:98
-#, c-format
-msgid "Status: %s"
-msgstr "状態: %s"
-
-#: lxc/publish.go:36 lxc/publish.go:37
-msgid "Stop the container if currently running"
-msgstr "実行中の場合、コンテナを停止します"
-
-#: lxc/delete.go:107 lxc/publish.go:114
-msgid "Stopping container failed!"
-msgstr "コンテナの停止に失敗しました!"
-
-#: lxc/storage.go:398
-#, c-format
-msgid "Storage pool %s created"
-msgstr "ストレージプール %s を作成しました"
-
-#: lxc/storage.go:448
-#, c-format
-msgid "Storage pool %s deleted"
-msgstr "ストレージプール %s を削除しました"
-
-#: lxc/init.go:145 lxc/init.go:146
-msgid "Storage pool name"
-msgstr "ストレージプール名"
-
-#: lxc/storage.go:672
-#, c-format
-msgid "Storage volume %s created"
-msgstr "ストレージボリューム %s を作成しました"
-
-#: lxc/storage.go:682
-#, c-format
-msgid "Storage volume %s deleted"
-msgstr "ストレージボリューム %s を削除しました"
-
-#: lxc/action.go:48
-msgid "Store the container state (only for stop)"
-msgstr "コンテナの状態を保存します (stopのみ)"
-
-#: lxc/info.go:169
-msgid "Swap (current)"
-msgstr "Swap (現在値)"
-
-#: lxc/info.go:173
-msgid "Swap (peak)"
-msgstr "Swap (ピーク)"
-
-#: lxc/list.go:414 lxc/network.go:435 lxc/storage.go:648
-msgid "TYPE"
+"lxc profile set [<remote>:]<profile> <key> <value>\n"
+"    Set profile configuration.\n"
+"\n"
+"lxc profile unset [<remote>:]<profile> <key>\n"
+"    Unset profile configuration.\n"
+"\n"
+"lxc profile delete [<remote>:]<profile>\n"
+"    Delete a profile.\n"
+"\n"
+"lxc profile edit [<remote>:]<profile>\n"
+"    Edit profile, either by launching external editor or reading STDIN.\n"
+"\n"
+"*Profile assignment*\n"
+"lxc profile assign [<remote>:]<container> <profiles>\n"
+"    Replace the current set of profiles for the container by the one "
+"provided.\n"
+"\n"
+"lxc profile add [<remote>:]<container> <profile>\n"
+"    Add a profile to a container\n"
+"\n"
+"lxc profile remove [<remote>:]<container> <profile>\n"
+"    Remove the profile from a container\n"
+"\n"
+"*Device management*\n"
+"lxc profile device list [<remote>:]<profile>\n"
+"    List devices in the given profile.\n"
+"\n"
+"lxc profile device show [<remote>:]<profile>\n"
+"    Show full device details in the given profile.\n"
+"\n"
+"lxc profile device remove [<remote>:]<profile> <name>\n"
+"    Remove a device from a profile.\n"
+"\n"
+"lxc profile device get [<remote>:]<profile> <name> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc profile device unset [<remote>:]<profile> <name> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
+"    Add a profile device, such as a disk or a nic, to the containers using "
+"the specified profile.\n"
+"\n"
+"*Examples*\n"
+"cat profile.yaml | lxc profile edit <profile>\n"
+"    Update a profile using the content of profile.yaml\n"
+"\n"
+"lxc profile assign foo default,bar\n"
+"    Set the profiles for \"foo\" to \"default\" and \"bar\".\n"
+"\n"
+"lxc profile assign foo default\n"
+"    Reset \"foo\" to only using the \"default\" profile.\n"
+"\n"
+"lxc profile assign foo ''\n"
+"    Remove all profile from \"foo\""
 msgstr ""
+"設定プロファイルを管理します。\n"
+"\n"
+"lxc profile list [<remote>:]\n"
+"    利用可能なプロファイルを一覧します。\n"
+"lxc profile show [<remote>:]<profile>\n"
+"    プロファイルの詳細を表示します。\n"
+"lxc profile create [<remote>:]<profile>\n"
+"    プロファイルを作成します。\n"
+"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
+"    プロファイルをコピーします。\n"
+"lxc profile get [<remote>:]<profile> <key>\n"
+"    プロファイルの設定を取得します。\n"
+"lxc profile set [<remote>:]<profile> <key> <value>\n"
+"    プロファイルの設定を設定します。\n"
+"lxc profile unset [<remote>:]<profile> <key>\n"
+"    プロファイルから設定項目を削除します。\n"
+"lxc profile delete [<remote>:]<profile>\n"
+"    プロファイルを削除します。\n"
+"lxc profile edit [<remote>:]<profile>\n"
+"    プロファイルを編集します。外部エディタもしくはSTDINから読み込みます。\n"
+"    例: lxc profile edit <profile> # エディタの起動\n"
+"        cat profile.yaml | lxc profile edit <profile> # profile.yaml から読み"
+"込み\n"
+"\n"
+"lxc profile assign [<remote>:]<container> <profiles>\n"
+"    プロファイルのコンマ区切りのリストをコンテナに順番に割り当てます。\n"
+"    このコマンドで指定したプロファイルだけが対象のコンテナに適用されます。\n"
+"    つまり、コマンドで指定したコンテナに正確にプロファイルのリストを設定しま"
+"す。\n"
+"    コンテナから特定のプロファイルを追加したり削除したりするには、この\n"
+"    後の {add|remove} を使います。\n"
+"    例: lxc profile assign foo default,bar # defaultとbarを適用\n"
+"        lxc profile assign foo default # defaultだけを有効化\n"
+"        lxc profile assign '' # 一切のプロファイルを適用しない\n"
+"        lxc profile assign bar,default # defaultを2番目に適用\n"
+"lxc profile add [<remote>:]<container> <profile>\n"
+"    コンテナにプロファイルを追加します。\n"
+"lxc profile remove [<remote>:]<container> <profile>\n"
+"    コンテナからプロファイルを削除します。\n"
+"\n"
+"デバイス:\n"
+"lxc profile device list [<remote>:]<profile>\n"
+"    指定したプロファイル内のデバイスを一覧表示します\n"
+"lxc profile device show [<remote>:]<profile>\n"
+"    指定したプロファイル内の全デバイスの詳細を表示します\n"
+"lxc profile device remove [<remote>:]<profile> <name>\n"
+"    プロファイルからデバイスを削除します\n"
+"lxc profile device get [<remote>:]<profile> <name> <key>\n"
+"    デバイスプロパティを取得します\n"
+"lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
+"    デバイスプロパティを設定します\n"
+"lxc profile device unset <[remote:]profile> <name> <key>\n"
+"    デバイスプロパティを削除します\n"
+"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
+"    ディスクやNICのようなプロファイルデバイスを指定したプロファイルを使って\n"
+"    コンテナに追加します。"
 
-#: lxc/delete.go:93
-msgid "The container is currently running, stop it first or pass --force."
-msgstr "コンテナは実行中です。先に停止させるか、--force を指定してください。"
-
-#: lxc/publish.go:92
+#: lxc/publish.go:27
+#, fuzzy
 msgid ""
-"The container is currently running. Use --force to have it stopped and "
-"restarted."
-msgstr ""
-"コンテナは現在実行中です。停止して、再起動するために --force を使用してくだ\n"
-"さい。"
-
-#: lxc/init.go:329
-msgid "The container you are starting doesn't have any network attached to it."
-msgstr "起動しようとしたコンテナに接続されているネットワークがありません。"
-
-#: lxc/config.go:680 lxc/config.go:692 lxc/config.go:725 lxc/config.go:743
-#: lxc/config.go:781 lxc/config.go:799
-msgid "The device doesn't exist"
-msgstr "デバイスが存在しません"
-
-#: lxc/init.go:313
-#, c-format
-msgid "The local image '%s' couldn't be found, trying '%s:' instead."
-msgstr ""
-"ローカルイメージ '%s' が見つかりません。代わりに '%s:' を試してみてください。"
-
-#: lxc/main.go:181
-msgid "The opposite of `lxc pause` is `lxc start`."
-msgstr "`lxc pause` の反対のコマンドは `lxc start` です。"
-
-#: lxc/network.go:238 lxc/network.go:287 lxc/storage.go:338 lxc/storage.go:438
-msgid "The specified device doesn't exist"
-msgstr "指定したデバイスが存在しません"
-
-#: lxc/network.go:242 lxc/network.go:291
-msgid "The specified device doesn't match the network"
-msgstr "指定したデバイスはネットワークとマッチしません"
-
-#: lxc/publish.go:65
-msgid "There is no \"image name\".  Did you want an alias?"
-msgstr ""
-"publish 先にはイメージ名は指定できません。\"--alias\" オプションを使ってくだ"
-"さい。"
-
-#: lxc/action.go:44
-msgid "Time to wait for the container before killing it"
-msgstr "コンテナを強制停止するまでの時間"
-
-#: lxc/image.go:314
-msgid "Timestamps:"
-msgstr "タイムスタンプ:"
-
-#: lxc/init.go:331
-msgid "To attach a network to a container, use: lxc network attach"
+"Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]\n"
+"\n"
+"Publish containers as images."
 msgstr ""
-"コンテナにネットワークを接続するには、lxc network attach を使用してください"
+"イメージとしてコンテナを publish します。\n"
+"\n"
+"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]"
 
-#: lxc/init.go:330
-msgid "To create a new network, use: lxc network create"
+#: lxc/remote.go:37
+#, fuzzy
+msgid ""
+"Usage: lxc remote <subcommand> [options]\n"
+"\n"
+"Manage the list of remote LXD servers.\n"
+"\n"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
+"password=PASSWORD] [--public] [--protocol=PROTOCOL]\n"
+"    Add the remote <remote> at <url>.\n"
+"\n"
+"lxc remote remove <remote>\n"
+"    Remove the remote <remote>.\n"
+"\n"
+"lxc remote list\n"
+"    List all remotes.\n"
+"\n"
+"lxc remote rename <old name> <new name>\n"
+"    Rename remote <old name> to <new name>.\n"
+"\n"
+"lxc remote set-url <remote> <url>\n"
+"    Update <remote>'s url to <url>.\n"
+"\n"
+"lxc remote set-default <remote>\n"
+"    Set the default remote.\n"
+"\n"
+"lxc remote get-default\n"
+"    Print the default remote."
 msgstr ""
-"新しいネットワークを作成するには、lxc network create を使用してください"
+"リモートの LXD サーバを管理します。\n"
+"\n"
+"lxc remote add [<remote>] <IP|FQDN|URL>\n"
+"    [--accept-certificate] [--password=PASSWORD]\n"
+"    [--public] [--protocol=PROTOCOL]\n"
+"    <url> をリモートホスト <remote> として追加します。\n"
+"lxc remote remove <remote>\n"
+"    リモートホスト <remote> を削除します。\n"
+"lxc remote list\n"
+"    登録済みのリモートホストを全て一覧表示します。\n"
+"lxc remote rename <old name> <new name>\n"
+"    リモートホストの名前を <old name> から <new name> に変更します。\n"
+"lxc remote set-url <remote> <url>\n"
+"    <remote> の url を <url> に更新します。\n"
+"lxc remote set-default <remote>\n"
+"    <remote> をデフォルトのリモートホストに設定します。\n"
+"lxc remote get-default\n"
+"    デフォルトに設定されているリモートホストを表示します。"
 
-#: lxc/main.go:137
-msgid "To start your first container, try: lxc launch ubuntu:16.04"
+#: lxc/restore.go:21
+#, fuzzy
+msgid ""
+"Usage: lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"\n"
+"Restore containers from snapshots.\n"
+"\n"
+"If --stateful is passed, then the running state will be restored too.\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create the snapshot.\n"
+"\n"
+"lxc restore u1 snap0\n"
+"    Restore the snapshot."
 msgstr ""
-"初めてコンテナを起動するには、\"lxc launch ubuntu:16.04\" と実行してみてくだ"
-"さい"
-
-#: lxc/image.go:398
-#, c-format
-msgid "Transferring image: %s"
-msgstr "イメージを転送中: %s"
-
-#: lxc/action.go:97 lxc/launch.go:161
-#, c-format
-msgid "Try `lxc info --show-log %s` for more info"
-msgstr "更に情報を得るために `lxc info --show-log %s` を実行してみてください"
-
-#: lxc/info.go:100
-msgid "Type: ephemeral"
-msgstr "タイプ: ephemeral"
-
-#: lxc/info.go:102
-msgid "Type: persistent"
-msgstr "タイプ: persistent"
+"リソースの現在の状態をスナップショット時点の状態に設定します。\n"
+"\n"
+"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"\n"
+"スナップショットからコンテナをリストアします (オプションで実行状態もリスト\n"
+"アします。詳しくはスナップショットのヘルプをご覧ください)。\n"
+"\n"
+"例:\n"
+"スナップショットの作成:\n"
+"    lxc snapshot u1 snap0\n"
+"スナップショットからのリストア:\n"
+"    lxc restore u1 snap0"
 
-#: lxc/image.go:613
-msgid "UPLOAD DATE"
+#: lxc/snapshot.go:21
+#, fuzzy
+msgid ""
+"Usage: lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"Create container snapshots.\n"
+"\n"
+"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"running state, including process memory state, TCP connections, ...\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create a snapshot of \"u1\" called \"snap0\"."
 msgstr ""
+"コンテナの読み取り専用のスナップショットを作成します。\n"
+"\n"
+"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"コンテナのスナップショットを作成します (オプションでコンテナのメモリ状態を\n"
+"含めて)。--statefulが指定された場合、LXDはコンテナプロセスのメモリ状態、TCP\n"
+"接続などの実行状態を、あとでlxc restoreを使ってリストアできるように、コンテ\n"
+"ナのチェックポイントを取得しようとします (しかし、タイムアウトウィンドウが\n"
+"expireしたあとのTCP接続のように正常にリストアできないものもあります)\n"
+"\n"
+"例:\n"
+"lxc snapshot u1 snap0"
 
-#: lxc/remote.go:381
-msgid "URL"
+#: lxc/storage.go:61
+msgid ""
+"Usage: lxc storage <subcommand> [options]\n"
+"\n"
+"Manage storage pools and volumes.\n"
+"\n"
+"*Storage pools*\n"
+"lxc storage list [<remote>:]\n"
+"    List available storage pools.\n"
+"\n"
+"lxc storage show [<remote>:]<pool>\n"
+"    Show details of a storage pool.\n"
+"\n"
+"lxc storage create [<remote>:]<pool> <driver> [key=value]...\n"
+"    Create a storage pool.\n"
+"\n"
+"lxc storage get [<remote>:]<pool> <key>\n"
+"    Get storage pool configuration.\n"
+"\n"
+"lxc storage set [<remote>:]<pool> <key> <value>\n"
+"    Set storage pool configuration.\n"
+"\n"
+"lxc storage unset [<remote>:]<pool> <key>\n"
+"    Unset storage pool configuration.\n"
+"\n"
+"lxc storage delete [<remote>:]<pool>\n"
+"    Delete a storage pool.\n"
+"\n"
+"lxc storage edit [<remote>:]<pool>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Storage volumes*\n"
+"lxc storage volume list [<remote>:]<pool>\n"
+"    List available storage volumes on a storage pool.\n"
+"\n"
+"lxc storage volume show [<remote>:]<pool> <volume>\n"
+"    Show details of a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...\n"
+"    Create a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume get [<remote>:]<pool> <volume> <key>\n"
+"    Get storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>\n"
+"    Set storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume unset [<remote>:]<pool> <volume> <key>\n"
+"    Unset storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume delete [<remote>:]<pool> <volume>\n"
+"    Delete a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
+"name] <path>\n"
+"    Attach a storage volume to the specified container.\n"
+"\n"
+"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name] <path>\n"
+"    Attach a storage volume to the specified profile.\n"
+"\n"
+"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
+"name]\n"
+"    Detach a storage volume from the specified container.\n"
+"\n"
+"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name]\n"
+"    Detach a storage volume from the specified profile.\n"
+"\n"
+"Unless specified through a prefix, all volume operations affect \"custom"
+"\" (user created) volumes.\n"
+"\n"
+"*Examples*\n"
+"cat pool.yaml | lxc storage edit [<remote>:]<pool>\n"
+"    Update a storage pool using the content of pool.yaml.\n"
+"\n"
+"cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Update a storage volume using the content of pool.yaml.\n"
+"\n"
+"lxc storage volume show default data\n"
+"    Will show the properties of a custom volume called \"data\" in the "
+"\"default\" pool.\n"
+"\n"
+"lxc storage volume show default container/data\n"
+"    Will show the properties of the filesystem for a container called \"data"
+"\" in the \"default\" pool."
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
-msgid "USED BY"
+#: lxc/version.go:18
+#, fuzzy
+msgid ""
+"Usage: lxc version\n"
+"\n"
+"Print the version number of this client tool."
 msgstr ""
+"お使いのクライアントのバージョン番号を表示します。\n"
+"\n"
+"lxc version"
 
-#: lxc/remote.go:95
-msgid "Unable to read remote TLS certificate"
-msgstr "リモートの TLS 証明書を読めません"
-
-#: lxc/image.go:319
-#, c-format
-msgid "Uploaded: %s"
-msgstr "アップロード日時: %s"
-
-#: lxc/main.go:112
-#, c-format
-msgid "Usage: %s"
-msgstr "使い方: %s"
-
-#: lxc/help.go:48
-msgid "Usage: lxc <command> [options]"
-msgstr "使い方: lxc <コマンド> [オプション]"
-
-#: lxc/delete.go:47
+#: lxc/delete.go:45
 msgid "User aborted delete operation."
 msgstr "ユーザが削除操作を中断しました。"
 
-#: lxc/restore.go:38
+#: lxc/restore.go:37
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
 "available)"
 msgstr ""
 "スナップショットからコンテナの稼動状態をリストアするかどうか (取得可能な場合)"
 
-#: lxc/snapshot.go:38
+#: lxc/snapshot.go:35
 msgid "Whether or not to snapshot the container's running state"
 msgstr "コンテナの稼動状態のスナップショットを取得するかどうか"
 
-#: lxc/network.go:422 lxc/remote.go:356 lxc/remote.go:361
+#: lxc/network.go:446 lxc/remote.go:370 lxc/remote.go:375
 msgid "YES"
 msgstr ""
 
-#: lxc/main.go:52
+#: lxc/main.go:55
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr "`lxc config profile` は廃止されました。`lxc profile` を使ってください"
 
-#: lxc/launch.go:132
+#: lxc/launch.go:130
 msgid "bad number of things scanned from image, container or snapshot"
 msgstr ""
 "イメージ、コンテナ、スナップショットのいずれかからスキャンされた数が不正"
 
-#: lxc/action.go:93
+#: lxc/action.go:94
 msgid "bad result type from action"
 msgstr "アクションからの結果タイプが不正です"
 
@@ -2057,53 +2214,53 @@ msgstr "アクションからの結果タイプが不正です"
 msgid "can't copy to the same container name"
 msgstr "同じコンテナ名へはコピーできません"
 
-#: lxc/file.go:309
+#: lxc/file.go:316
 msgid "can't pull a directory without --recursive"
 msgstr ""
 "ディレクトリを pull する場合は --recursive オプションを使用してください"
 
-#: lxc/remote.go:344
+#: lxc/remote.go:358
 msgid "can't remove the default remote"
 msgstr "デフォルトのリモートは削除できません"
 
-#: lxc/file.go:120
+#: lxc/file.go:127
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr "再帰 (recursive) モードでは uid/gid/mode を指定できません"
 
-#: lxc/remote.go:370
+#: lxc/remote.go:384
 msgid "default"
 msgstr ""
 
 #: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
-#: lxc/init.go:236 lxc/init.go:241 lxc/launch.go:116 lxc/launch.go:121
+#: lxc/init.go:234 lxc/init.go:239 lxc/launch.go:114 lxc/launch.go:119
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 "サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
 "した"
 
-#: lxc/image.go:305
+#: lxc/image.go:307
 msgid "disabled"
 msgstr "無効"
 
-#: lxc/image.go:307
+#: lxc/image.go:309
 msgid "enabled"
 msgstr "有効"
 
-#: lxc/action.go:125 lxc/main.go:22 lxc/main.go:148
+#: lxc/action.go:126 lxc/main.go:25 lxc/main.go:159
 #, c-format
 msgid "error: %v"
 msgstr "エラー: %v"
 
-#: lxc/help.go:40 lxc/main.go:107
+#: lxc/help.go:37 lxc/main.go:106
 #, c-format
 msgid "error: unknown command: %s"
 msgstr "エラー: 未知のコマンド: %s"
 
-#: lxc/launch.go:136
+#: lxc/launch.go:134
 msgid "got bad version"
 msgstr "不正なバージョンを得ました"
 
-#: lxc/image.go:300 lxc/image.go:589
+#: lxc/image.go:302 lxc/image.go:591
 msgid "no"
 msgstr ""
 
@@ -2111,48 +2268,48 @@ msgstr ""
 msgid "not all the profiles from the source exist on the target"
 msgstr "コピー元の全てのプロファイルがターゲットに存在しません"
 
-#: lxc/remote.go:218
+#: lxc/remote.go:232
 msgid "ok (y/n)?"
 msgstr "ok (y/n)?"
 
-#: lxc/main.go:305 lxc/main.go:309
+#: lxc/main.go:331 lxc/main.go:335
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr "エイリアスの処理が失敗しました %s\n"
 
-#: lxc/file.go:376
+#: lxc/file.go:383
 msgid "recursive edit doesn't make sense :("
 msgstr "再帰的な edit は意味がありません :("
 
-#: lxc/remote.go:406
+#: lxc/remote.go:420
 #, c-format
 msgid "remote %s already exists"
 msgstr "リモート %s は既に存在します"
 
-#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
+#: lxc/remote.go:350 lxc/remote.go:412 lxc/remote.go:447 lxc/remote.go:463
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "リモート %s は存在しません"
 
-#: lxc/remote.go:319
+#: lxc/remote.go:333
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "リモート %s は <%s> として存在します"
 
-#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
+#: lxc/remote.go:354 lxc/remote.go:416 lxc/remote.go:451
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr "リモート %s は static ですので変更できません"
 
-#: lxc/info.go:219
+#: lxc/info.go:221
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:221
+#: lxc/info.go:223
 msgid "stateless"
 msgstr ""
 
-#: lxc/info.go:215
+#: lxc/info.go:217
 #, c-format
 msgid "taken at %s"
 msgstr "%s に取得しました"
@@ -2161,11 +2318,11 @@ msgstr "%s に取得しました"
 msgid "unreachable return reached"
 msgstr "到達しないはずのreturnに到達しました"
 
-#: lxc/main.go:237
+#: lxc/main.go:262
 msgid "wrong number of subcommand arguments"
 msgstr "サブコマンドの引数の数が正しくありません"
 
-#: lxc/delete.go:46 lxc/image.go:302 lxc/image.go:593
+#: lxc/delete.go:44 lxc/image.go:304 lxc/image.go:595
 msgid "yes"
 msgstr ""
 
@@ -2173,6 +2330,50 @@ msgstr ""
 msgid "you must specify a source container name"
 msgstr "コピー元のコンテナ名を指定してください"
 
+#~ msgid "Available commands:"
+#~ msgstr "使用可能なコマンド:"
+
+#~ msgid ""
+#~ "Check if the LXD instance is up.\n"
+#~ "\n"
+#~ "lxc finger [<remote>:]"
+#~ msgstr ""
+#~ "LXDインスタンスが稼働中かを確認します。\n"
+#~ "\n"
+#~ "lxc finger [<remote>:]"
+
+#~ msgid ""
+#~ "Help page for the LXD client.\n"
+#~ "\n"
+#~ "lxc help [--all]"
+#~ msgstr ""
+#~ "LXDクライアントのヘルプページを表示します。\n"
+#~ "\n"
+#~ "lxd help [--all]"
+
+#~ msgid ""
+#~ "List information on LXD servers and containers.\n"
+#~ "\n"
+#~ "For a container:\n"
+#~ "    lxc info [<remote:>]<container> [--show-log]\n"
+#~ "\n"
+#~ "For a server:\n"
+#~ "    lxc info [<remote:>]"
+#~ msgstr ""
+#~ "LXD サーバとコンテナの情報を一覧表示します。\n"
+#~ "\n"
+#~ "コンテナ情報:\n"
+#~ "    lxc info [<remote>:]<container> [--show-log]\n"
+#~ "\n"
+#~ "サーバ情報:\n"
+#~ "    lxc info [<remote>:]"
+
+#~ msgid "Print all the subcommands help."
+#~ msgstr "全てのサブコマンドのヘルプを表示します。"
+
+#~ msgid "Usage: %s"
+#~ msgstr "使い方: %s"
+
 #, fuzzy
 #~ msgid "Bad image property: %s"
 #~ msgstr "(不正なイメージプロパティ形式: %s\n"
@@ -2285,9 +2486,6 @@ msgstr "コピー元のコンテナ名を指定してください"
 #~ msgid "(Bad alias entry: %s\n"
 #~ msgstr "(不正なエイリアス: %s\n"
 
-#~ msgid "bad container url %s"
-#~ msgstr "コンテナの不正なURL %s"
-
 #~ msgid "bad version in container url"
 #~ msgstr "コンテナURL内のバージョンが不正"
 
diff --git a/po/lxd.pot b/po/lxd.pot
index 7a4dbf3..deb9f55 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2017-03-05 02:20-0500\n"
+        "POT-Creation-Date: 2017-03-05 02:21-0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -113,132 +113,119 @@ msgid   "### This is a yaml representation of the profile.\n"
         "### Note that the name is shown but cannot be changed"
 msgstr  ""
 
-#: lxc/image.go:586
+#: lxc/image.go:588
 #, c-format
 msgid   "%s (%d more)"
 msgstr  ""
 
-#: lxc/snapshot.go:61
+#: lxc/snapshot.go:58
 msgid   "'/' not allowed in snapshot name"
 msgstr  ""
 
-#: lxc/profile.go:254
+#: lxc/profile.go:293
 msgid   "(none)"
 msgstr  ""
 
-#: lxc/image.go:607 lxc/image.go:649
+#: lxc/image.go:609 lxc/image.go:651
 msgid   "ALIAS"
 msgstr  ""
 
-#: lxc/image.go:611
+#: lxc/image.go:613
 msgid   "ARCH"
 msgstr  ""
 
-#: lxc/list.go:406
+#: lxc/list.go:430
 msgid   "ARCHITECTURE"
 msgstr  ""
 
-#: lxc/remote.go:51
+#: lxc/remote.go:65
 msgid   "Accept certificate"
 msgstr  ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:281
 #, c-format
 msgid   "Admin password for %s: "
 msgstr  ""
 
-#: lxc/image.go:334
+#: lxc/image.go:336
 msgid   "Aliases:"
 msgstr  ""
 
-#: lxc/image.go:312 lxc/info.go:93
+#: lxc/image.go:314 lxc/info.go:95
 #, c-format
 msgid   "Architecture: %s"
 msgstr  ""
 
-#: lxc/image.go:338
+#: lxc/image.go:340
 #, c-format
 msgid   "Auto update: %s"
 msgstr  ""
 
-#: lxc/help.go:49
-msgid   "Available commands:"
-msgstr  ""
-
-#: lxc/info.go:186
+#: lxc/info.go:188
 msgid   "Bytes received"
 msgstr  ""
 
-#: lxc/info.go:187
+#: lxc/info.go:189
 msgid   "Bytes sent"
 msgstr  ""
 
-#: lxc/config.go:274
+#: lxc/config.go:310
 msgid   "COMMON NAME"
 msgstr  ""
 
-#: lxc/info.go:150
+#: lxc/info.go:152
 msgid   "CPU usage (in seconds)"
 msgstr  ""
 
-#: lxc/info.go:154
+#: lxc/info.go:156
 msgid   "CPU usage:"
 msgstr  ""
 
-#: lxc/list.go:407
+#: lxc/list.go:431
 msgid   "CREATED AT"
 msgstr  ""
 
-#: lxc/config.go:114 lxc/network.go:471
+#: lxc/config.go:150 lxc/network.go:495
 #, c-format
 msgid   "Can't read from stdin: %s"
 msgstr  ""
 
-#: lxc/config.go:127 lxc/config.go:160 lxc/config.go:182
+#: lxc/config.go:163 lxc/config.go:196 lxc/config.go:218
 #, c-format
 msgid   "Can't unset key '%s', it's not currently set."
 msgstr  ""
 
-#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
+#: lxc/network.go:422 lxc/profile.go:472 lxc/storage.go:579
 msgid   "Cannot provide container name to list"
 msgstr  ""
 
-#: lxc/remote.go:217
+#: lxc/remote.go:231
 #, c-format
 msgid   "Certificate fingerprint: %x"
 msgstr  ""
 
-#: lxc/action.go:36
-#, c-format
-msgid   "Change state of one or more containers to %s.\n"
-        "\n"
-        "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-msgstr  ""
-
-#: lxc/finger.go:15
-msgid   "Check if the LXD instance is up.\n"
-        "\n"
-        "lxc finger [<remote>:]"
-msgstr  ""
-
-#: lxc/remote.go:290
+#: lxc/remote.go:304
 msgid   "Client certificate stored at server: "
 msgstr  ""
 
-#: lxc/list.go:101 lxc/list.go:102
+#: lxc/list.go:125 lxc/list.go:126
 msgid   "Columns"
 msgstr  ""
 
-#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:137 lxc/init.go:138
+#: lxc/help.go:53
+msgid   "Commands:"
+msgstr  ""
+
+#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:135 lxc/init.go:136
 msgid   "Config key/value to apply to the new container"
 msgstr  ""
 
-#: lxc/config.go:535 lxc/config.go:600 lxc/image.go:703 lxc/network.go:354 lxc/profile.go:218 lxc/storage.go:497 lxc/storage.go:802
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:705 lxc/network.go:378 lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:840
 #, c-format
 msgid   "Config parsing error: %s"
 msgstr  ""
 
-#: lxc/main.go:29
+#: lxc/main.go:32
 msgid   "Connection refused; is LXD running?"
 msgstr  ""
 
@@ -246,7 +233,7 @@ msgstr  ""
 msgid   "Container name is mandatory"
 msgstr  ""
 
-#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:246
+#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:244
 #, c-format
 msgid   "Container name is: %s"
 msgstr  ""
@@ -256,69 +243,47 @@ msgstr  ""
 msgid   "Container published with fingerprint: %s"
 msgstr  ""
 
-#: lxc/image.go:132
+#: lxc/image.go:134
 msgid   "Copy aliases from source"
 msgstr  ""
 
-#: lxc/copy.go:25
-msgid   "Copy containers within or in between LXD instances.\n"
-        "\n"
-        "lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-msgstr  ""
-
-#: lxc/image.go:245
+#: lxc/image.go:247
 #, c-format
 msgid   "Copying the image: %s"
 msgstr  ""
 
-#: lxc/remote.go:232
+#: lxc/remote.go:246
 msgid   "Could not create server cert dir"
 msgstr  ""
 
-#: lxc/file.go:84
+#: lxc/file.go:91
 #, c-format
 msgid   "Could not sanitize path %s"
 msgstr  ""
 
-#: lxc/snapshot.go:21
-msgid   "Create a read-only snapshot of a container.\n"
-        "\n"
-        "lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-        "\n"
-        "Creates a snapshot of the container (optionally with the container's memory\n"
-        "state). When --stateful is used, LXD attempts to checkpoint the container's\n"
-        "running state, including process memory state, TCP connections, etc. so that it\n"
-        "can be restored (via lxc restore) at a later time (although some things, e.g.\n"
-        "TCP connections after the TCP timeout window has expired, may not be restored\n"
-        "successfully).\n"
-        "\n"
-        "Example:\n"
-        "    lxc snapshot u1 snap0"
-msgstr  ""
-
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:67 lxc/file.go:68
 msgid   "Create any directories necessary"
 msgstr  ""
 
-#: lxc/image.go:317 lxc/info.go:95
+#: lxc/image.go:319 lxc/info.go:97
 #, c-format
 msgid   "Created: %s"
 msgstr  ""
 
-#: lxc/init.go:184 lxc/launch.go:139
+#: lxc/init.go:182 lxc/launch.go:137
 #, c-format
 msgid   "Creating %s"
 msgstr  ""
 
-#: lxc/init.go:182
+#: lxc/init.go:180
 msgid   "Creating the container"
 msgstr  ""
 
-#: lxc/image.go:610 lxc/image.go:651
+#: lxc/image.go:612 lxc/image.go:653
 msgid   "DESCRIPTION"
 msgstr  ""
 
-#: lxc/storage.go:570
+#: lxc/storage.go:608
 msgid   "DRIVER"
 msgstr  ""
 
@@ -326,41 +291,33 @@ msgstr  ""
 msgid   "Define a compression algorithm: for image or none"
 msgstr  ""
 
-#: lxc/delete.go:26
-msgid   "Delete containers or snapshots.\n"
-        "\n"
-        "lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/<snapshot>]...]\n"
-        "\n"
-        "Destroy containers or snapshots with any attached data (configuration, snapshots, ...)."
-msgstr  ""
-
-#: lxc/config.go:652
+#: lxc/config.go:688
 #, c-format
 msgid   "Device %s added to %s"
 msgstr  ""
 
-#: lxc/config.go:839
+#: lxc/config.go:875
 #, c-format
 msgid   "Device %s removed from %s"
 msgstr  ""
 
-#: lxc/info.go:143
+#: lxc/info.go:145
 msgid   "Disk usage:"
 msgstr  ""
 
-#: lxc/list.go:554
+#: lxc/list.go:578
 msgid   "EPHEMERAL"
 msgstr  ""
 
-#: lxc/config.go:276
+#: lxc/config.go:312
 msgid   "EXPIRY DATE"
 msgstr  ""
 
-#: lxc/main.go:41
+#: lxc/main.go:44
 msgid   "Enable debug mode"
 msgstr  ""
 
-#: lxc/main.go:40
+#: lxc/main.go:43
 msgid   "Enable verbose mode"
 msgstr  ""
 
@@ -368,11 +325,11 @@ msgstr  ""
 msgid   "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr  ""
 
-#: lxc/help.go:69
+#: lxc/help.go:77
 msgid   "Environment:"
 msgstr  ""
 
-#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:141 lxc/init.go:142
+#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:139 lxc/init.go:140
 msgid   "Ephemeral container"
 msgstr  ""
 
@@ -380,120 +337,102 @@ msgstr  ""
 msgid   "Event type to listen for"
 msgstr  ""
 
-#: lxc/exec.go:46
-msgid   "Execute the specified command in a container.\n"
-        "\n"
-        "lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--env KEY=VALUE...] [--] <command line>\n"
-        "\n"
-        "Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored)."
-msgstr  ""
-
-#: lxc/image.go:321
+#: lxc/image.go:323
 #, c-format
 msgid   "Expires: %s"
 msgstr  ""
 
-#: lxc/image.go:323
+#: lxc/image.go:325
 msgid   "Expires: never"
 msgstr  ""
 
-#: lxc/config.go:273 lxc/image.go:608 lxc/image.go:650
+#: lxc/config.go:309 lxc/image.go:610 lxc/image.go:652
 msgid   "FINGERPRINT"
 msgstr  ""
 
-#: lxc/list.go:104
-msgid   "Fast mode (same as --columns=nsacPt"
+#: lxc/manpage.go:62
+#, c-format
+msgid   "Failed to generate 'lxc.%s.1': %v"
+msgstr  ""
+
+#: lxc/manpage.go:55
+#, c-format
+msgid   "Failed to generate 'lxc.1': %v"
+msgstr  ""
+
+#: lxc/list.go:128
+msgid   "Fast mode (same as --columns=nsacPt)"
 msgstr  ""
 
-#: lxc/image.go:310
+#: lxc/image.go:312
 #, c-format
 msgid   "Fingerprint: %s"
 msgstr  ""
 
-#: lxc/action.go:45 lxc/action.go:46
+#: lxc/action.go:46 lxc/action.go:47
 msgid   "Force the container to shutdown"
 msgstr  ""
 
-#: lxc/delete.go:35 lxc/delete.go:36
+#: lxc/delete.go:33 lxc/delete.go:34
 msgid   "Force the removal of stopped containers"
 msgstr  ""
 
-#: lxc/main.go:42
+#: lxc/main.go:45
 msgid   "Force using the local unix socket"
 msgstr  ""
 
-#: lxc/image.go:135 lxc/list.go:103
+#: lxc/image.go:137 lxc/list.go:127
 msgid   "Format"
 msgstr  ""
 
-#: lxc/remote.go:65
+#: lxc/remote.go:79
 msgid   "Generating a client certificate. This may take a minute..."
 msgstr  ""
 
-#: lxc/help.go:25
-msgid   "Help page for the LXD client.\n"
-        "\n"
-        "lxc help [--all]"
-msgstr  ""
-
-#: lxc/list.go:404
+#: lxc/list.go:428
 msgid   "IPV4"
 msgstr  ""
 
-#: lxc/list.go:405
+#: lxc/list.go:429
 msgid   "IPV6"
 msgstr  ""
 
-#: lxc/config.go:275
+#: lxc/config.go:311
 msgid   "ISSUE DATE"
 msgstr  ""
 
-#: lxc/main.go:136
+#: lxc/main.go:139
 msgid   "If this is your first time using LXD, you should also run: lxd init"
 msgstr  ""
 
-#: lxc/main.go:43
+#: lxc/main.go:46
 msgid   "Ignore aliases when determining what command to run"
 msgstr  ""
 
-#: lxc/action.go:49
+#: lxc/action.go:50
 msgid   "Ignore the container state (only for start)"
 msgstr  ""
 
-#: lxc/image.go:248
+#: lxc/image.go:250
 msgid   "Image copied successfully!"
 msgstr  ""
 
-#: lxc/image.go:393 lxc/image.go:405
+#: lxc/image.go:395 lxc/image.go:407
 #, c-format
 msgid   "Image imported with fingerprint: %s"
 msgstr  ""
 
-#: lxc/image.go:390
+#: lxc/image.go:392
 #, c-format
 msgid   "Importing the image: %s"
 msgstr  ""
 
-#: lxc/init.go:75
-msgid   "Initialize a container from a particular image.\n"
-        "\n"
-        "lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--storage|-s <pool>]\n"
-        "\n"
-        "Initializes a container using the specified image and name.\n"
-        "\n"
-        "Not specifying -p will result in the default profile.\n"
-        "Specifying \"-p\" with no argument will result in no profile.\n"
-        "\n"
-        "Example:\n"
-        "    lxc init ubuntu:16.04 u1"
-msgstr  ""
-
-#: lxc/remote.go:135
+#: lxc/remote.go:149
 #, c-format
 msgid   "Invalid URL scheme \"%s\" in \"%s\""
 msgstr  ""
 
-#: lxc/config.go:254
+#: lxc/config.go:290
 msgid   "Invalid certificate"
 msgstr  ""
 
@@ -501,132 +440,55 @@ msgstr  ""
 msgid   "Invalid configuration key"
 msgstr  ""
 
-#: lxc/file.go:352
+#: lxc/file.go:359
 #, c-format
 msgid   "Invalid path %s"
 msgstr  ""
 
-#: lxc/file.go:286
+#: lxc/file.go:293
 #, c-format
 msgid   "Invalid source %s"
 msgstr  ""
 
-#: lxc/file.go:73
+#: lxc/file.go:80
 #, c-format
 msgid   "Invalid target %s"
 msgstr  ""
 
-#: lxc/info.go:124
+#: lxc/info.go:126
 msgid   "Ips:"
 msgstr  ""
 
-#: lxc/image.go:133
+#: lxc/image.go:135
 msgid   "Keep the image up to date after initial copy"
 msgstr  ""
 
-#: lxc/list.go:408
+#: lxc/list.go:432
 msgid   "LAST USED AT"
 msgstr  ""
 
-#: lxc/main.go:27
+#: lxc/main.go:30
 msgid   "LXD socket not found; is LXD installed and running?"
 msgstr  ""
 
-#: lxc/image.go:326
+#: lxc/image.go:328
 #, c-format
 msgid   "Last used: %s"
 msgstr  ""
 
-#: lxc/image.go:328
+#: lxc/image.go:330
 msgid   "Last used: never"
 msgstr  ""
 
-#: lxc/launch.go:23
-msgid   "Launch a container from a particular image.\n"
-        "\n"
-        "lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--storage|-s <pool>]\n"
-        "\n"
-        "Launches a container using the specified image and name.\n"
-        "\n"
-        "Not specifying -p will result in the default profile.\n"
-        "Specifying \"-p\" with no argument will result in no profile.\n"
-        "\n"
-        "Example:\n"
-        "    lxc launch ubuntu:16.04 u1"
-msgstr  ""
-
-#: lxc/info.go:25
-msgid   "List information on LXD servers and containers.\n"
-        "\n"
-        "For a container:\n"
-        "    lxc info [<remote:>]<container> [--show-log]\n"
-        "\n"
-        "For a server:\n"
-        "    lxc info [<remote:>]"
-msgstr  ""
-
-#: lxc/list.go:47
-msgid   "Lists the containers.\n"
-        "\n"
-        "lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--fast]\n"
-        "\n"
-        "The filters are:\n"
-        "* A single keyword like \"web\" which will list any container with a name starting by \"web\".\n"
-        "* A regular expression on the container name. (e.g. .*web.*01$)\n"
-        "* A key/value pair referring to a configuration item. For those, the namespace can be abbreviated to the smallest unambiguous identifier:\n"
-        " * \"user.blah=abc\" will list all containers with the \"blah\" user property set to \"abc\".\n"
-        " * \"u.blah=abc\" will do the same\n"
-        " * \"security.privileged=1\" will list all privileged containers\n"
-        " * \"s.privileged=1\" will do the same\n"
-        "* A regular expression matching a configuration item or its value. (e.g. volatile.eth0.hwaddr=00:16:3e:.*)\n"
-        "\n"
-        "The -c option takes a comma separated list of arguments that control\n"
-        "which container attributes to output when displaying in table format.\n"
-        "Column arguments are either pre-defined shorthand chars (see below),\n"
-        "or (extended) config keys.  Commas between consecutive shorthand chars\n"
-        "are optional.\n"
-        "\n"
-        "Pre-defined shorthand chars:\n"
-        "* 4 - IPv4 address\n"
-        "* 6 - IPv6 address\n"
-        "* a - architecture\n"
-        "* b - storage pool\n"
-        "* c - creation date\n"
-        "* l - last used date\n"
-        "* n - name\n"
-        "* p - pid of container init process\n"
-        "* P - profiles\n"
-        "* s - state\n"
-        "* S - number of snapshots\n"
-        "* t - type (persistent or ephemeral)\n"
-        "\n"
-        "Config key syntax: key[:name][:maxWidth]\n"
-        "* key      - The (extended) config key to display\n"
-        "* name     - Name to display in the column header, defaults to the key\n"
-        "             if not specified or if empty (to allow defining maxWidth\n"
-        "             without a custom name, e.g. user.key::0)\n"
-        "* maxWidth - Max width of the column (longer results are truncated).\n"
-        "             -1 == unlimited\n"
-        "              0 == width of column header\n"
-        "             >0 == max width in chars\n"
-        "             Default is -1 (unlimited)\n"
-        "\n"
-        "Default column layout: ns46tS\n"
-        "Fast column layout: nsacPt\n"
-        "\n"
-        "Example:\n"
-        "    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:MAC"
-msgstr  ""
-
-#: lxc/info.go:239
+#: lxc/info.go:241
 msgid   "Log:"
 msgstr  ""
 
-#: lxc/network.go:436
+#: lxc/network.go:460
 msgid   "MANAGED"
 msgstr  ""
 
-#: lxc/image.go:131
+#: lxc/image.go:133
 msgid   "Make image public"
 msgstr  ""
 
@@ -634,376 +496,106 @@ msgstr  ""
 msgid   "Make the image public"
 msgstr  ""
 
-#: lxc/profile.go:49
-msgid   "Manage configuration profiles.\n"
-        "\n"
-        "lxc profile list [<remote>:]                                    List available profiles.\n"
-        "lxc profile show [<remote>:]<profile>                           Show details of a profile.\n"
-        "lxc profile create [<remote>:]<profile>                         Create a profile.\n"
-        "lxc profile copy [<remote>:]<profile> [<remote>:]<profile>      Copy the profile.\n"
-        "lxc profile get [<remote>:]<profile> <key>                      Get profile configuration.\n"
-        "lxc profile set [<remote>:]<profile> <key> <value>              Set profile configuration.\n"
-        "lxc profile unset [<remote>:]<profile> <key>                    Unset profile configuration.\n"
-        "lxc profile delete [<remote>:]<profile>                         Delete a profile.\n"
-        "lxc profile edit [<remote>:]<profile>\n"
-        "    Edit profile, either by launching external editor or reading STDIN.\n"
-        "    Example: lxc profile edit <profile> # launch editor\n"
-        "             cat profile.yaml | lxc profile edit <profile> # read from profile.yaml\n"
-        "\n"
-        "lxc profile assign [<remote>:]<container> <profiles>\n"
-        "    Assign a comma-separated list of profiles to a container, in order.\n"
-        "    All profiles passed in this call (and only those) will be applied\n"
-        "    to the specified container, i.e. it sets the list of profiles exactly to\n"
-        "    those specified in this command. To add/remove a particular profile from a\n"
-        "    container, use {add|remove} below.\n"
-        "    Example: lxc profile assign foo default,bar # Apply default and bar\n"
-        "             lxc profile assign foo default # Only default is active\n"
-        "             lxc profile assign '' # no profiles are applied anymore\n"
-        "             lxc profile assign bar,default # Apply default second now\n"
-        "lxc profile add [<remote>:]<container> <profile> # add a profile to a container\n"
-        "lxc profile remove [<remote>:]<container> <profile> # remove the profile from a container\n"
-        "\n"
-        "Devices:\n"
-        "lxc profile device list [<remote>:]<profile>                                List devices in the given profile.\n"
-        "lxc profile device show [<remote>:]<profile>                                Show full device details in the given profile.\n"
-        "lxc profile device remove [<remote>:]<profile> <name>                       Remove a device from a profile.\n"
-        "lxc profile device get [<remote>:]<profile> <name> <key>                    Get a device property.\n"
-        "lxc profile device set [<remote>:]<profile> <name> <key> <value>            Set a device property.\n"
-        "lxc profile device unset [<remote>:]<profile> <name> <key>                  Unset a device property.\n"
-        "lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
-        "    Add a profile device, such as a disk or a nic, to the containers using the specified profile."
-msgstr  ""
-
-#: lxc/config.go:58
-msgid   "Manage configuration.\n"
-        "\n"
-        "lxc config device add [<remote>:]<container> <device> <type> [key=value...]   Add a device to a container.\n"
-        "lxc config device get [<remote>:]<container> <device> <key>                   Get a device property.\n"
-        "lxc config device set [<remote>:]<container> <device> <key> <value>           Set a device property.\n"
-        "lxc config device unset [<remote>:]<container> <device> <key>                 Unset a device property.\n"
-        "lxc config device list [<remote>:]<container>                                 List devices for container.\n"
-        "lxc config device show [<remote>:]<container>                                 Show full device details for container.\n"
-        "lxc config device remove [<remote>:]<container> <name>                        Remove device from container.\n"
-        "\n"
-        "lxc config get [<remote>:][container] <key>                                   Get container or server configuration key.\n"
-        "lxc config set [<remote>:][container] <key> <value>                           Set container or server configuration key.\n"
-        "lxc config unset [<remote>:][container] <key>                                 Unset container or server configuration key.\n"
-        "lxc config show [<remote>:][container] [--expanded]                           Show container or server configuration.\n"
-        "lxc config edit [<remote>:][container]                                        Edit container or server configuration in external editor.\n"
-        "    Edit configuration, either by launching external editor or reading STDIN.\n"
-        "    Example: lxc config edit <container> # launch editor\n"
-        "             cat config.yaml | lxc config edit <container> # read from config.yaml\n"
-        "\n"
-        "lxc config trust list [<remote>:]                                             List all trusted certs.\n"
-        "lxc config trust add [<remote>:] <certfile.crt>                               Add certfile.crt to trusted hosts.\n"
-        "lxc config trust remove [<remote>:] [hostname|fingerprint]                    Remove the cert from trusted hosts.\n"
-        "\n"
-        "Examples:\n"
-        "To mount host's /share/c1 onto /opt in the container:\n"
-        "    lxc config device add [<remote>:]container1 <device-name> disk source=/share/c1 path=opt\n"
-        "\n"
-        "To set an lxc config value:\n"
-        "    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = 1'\n"
-        "\n"
-        "To listen on IPv4 and IPv6 port 8443 (you can omit the 8443 its the default):\n"
-        "    lxc config set core.https_address [::]:8443\n"
-        "\n"
-        "To set the server trust password:\n"
-        "    lxc config set core.trust_password blah"
-msgstr  ""
-
-#: lxc/file.go:36
-msgid   "Manage files in a container.\n"
-        "\n"
-        "lxc file pull [-r|--recursive] [<remote>:]<container> [[<remote>:]<container>...] <target path>\n"
-        "lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--mode=MODE] <source path> [<source path>...] [<remote>:]<container>\n"
-        "lxc file delete [<remote>:]<container> [[<remote>:]<container>...]\n"
-        "lxc file edit [<remote>:]<container>/<path>\n"
-        "\n"
-        "<source> in the case of pull, <target> in the case of push and <file> in the case of edit are <container name>/<path>\n"
-        "\n"
-        "Examples:\n"
-        "To push /etc/hosts into the container foo:\n"
-        "    lxc file push /etc/hosts foo/etc/hosts\n"
-        "\n"
-        "To pull /etc/hosts from the container:\n"
-        "    lxc file pull foo/etc/hosts ."
-msgstr  ""
-
-#: lxc/network.go:49
-msgid   "Manage networks.\n"
-        "\n"
-        "lxc network list [<remote>:]                              List available networks.\n"
-        "lxc network show [<remote>:]<network>                     Show details of a network.\n"
-        "lxc network create [<remote>:]<network> [key=value...]    Create a network.\n"
-        "lxc network get [<remote>:]<network> <key>                Get network configuration.\n"
-        "lxc network set [<remote>:]<network> <key> <value>        Set network configuration.\n"
-        "lxc network unset [<remote>:]<network> <key>              Unset network configuration.\n"
-        "lxc network delete [<remote>:]<network>                   Delete a network.\n"
-        "lxc network edit [<remote>:]<network>\n"
-        "    Edit network, either by launching external editor or reading STDIN.\n"
-        "    Example: lxc network edit <network> # launch editor\n"
-        "             cat network.yaml | lxc network edit <network> # read from network.yaml\n"
-        "\n"
-        "lxc network attach [<remote>:]<network> <container> [device name] [interface name]\n"
-        "lxc network attach-profile [<remote>:]<network> <profile> [device name] [interface name]\n"
-        "\n"
-        "lxc network detach [<remote>:]<network> <container> [device name]\n"
-        "lxc network detach-profile [<remote>:]<network> <container> [device name]"
-msgstr  ""
-
-#: lxc/remote.go:37
-msgid   "Manage remote LXD servers.\n"
-        "\n"
-        "lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--password=PASSWORD]\n"
-        "                                        [--public] [--protocol=PROTOCOL]    Add the remote <remote> at <url>.\n"
-        "lxc remote remove <remote>                                                  Remove the remote <remote>.\n"
-        "lxc remote list                                                             List all remotes.\n"
-        "lxc remote rename <old name> <new name>                                     Rename remote <old name> to <new name>.\n"
-        "lxc remote set-url <remote> <url>                                           Update <remote>'s url to <url>.\n"
-        "lxc remote set-default <remote>                                             Set the default remote.\n"
-        "lxc remote get-default                                                      Print the default remote."
-msgstr  ""
-
-#: lxc/storage.go:61
-msgid   "Manage storage.\n"
-        "\n"
-        "lxc storage list [<remote>:]                                    List available storage pools.\n"
-        "lxc storage show [<remote>:]<pool>                              Show details of a storage pool.\n"
-        "lxc storage create [<remote>:]<pool> <driver> [key=value]...    Create a storage pool.\n"
-        "lxc storage get [<remote>:]<pool> <key>                         Get storage pool configuration.\n"
-        "lxc storage set [<remote>:]<pool> <key> <value>                 Set storage pool configuration.\n"
-        "lxc storage unset [<remote>:]<pool> <key>                       Unset storage pool configuration.\n"
-        "lxc storage delete [<remote>:]<pool>                            Delete a storage pool.\n"
-        "lxc storage edit [<remote>:]<pool>\n"
-        "    Edit storage pool, either by launching external editor or reading STDIN.\n"
-        "    Example: lxc storage edit [<remote>:]<pool> # launch editor\n"
-        "             cat pool.yaml | lxc storage edit [<remote>:]<pool> # read from pool.yaml\n"
-        "\n"
-        "lxc storage volume list [<remote>:]<pool>                              List available storage volumes on a storage pool.\n"
-        "lxc storage volume show [<remote>:]<pool> <volume>                     Show details of a storage volume on a storage pool.\n"
-        "lxc storage volume create [<remote>:]<pool> <volume> [key=value]...    Create a storage volume on a storage pool.\n"
-        "lxc storage volume get [<remote>:]<pool> <volume> <key>                Get storage volume configuration on a storage pool.\n"
-        "lxc storage volume set [<remote>:]<pool> <volume> <key> <value>        Set storage volume configuration on a storage pool.\n"
-        "lxc storage volume unset [<remote>:]<pool> <volume> <key>              Unset storage volume configuration on a storage pool.\n"
-        "lxc storage volume delete [<remote>:]<pool> <volume>                   Delete a storage volume on a storage pool.\n"
-        "lxc storage volume edit [<remote>:]<pool> <volume>\n"
-        "    Edit storage pool, either by launching external editor or reading STDIN.\n"
-        "    Example: lxc storage volume edit [<remote>:]<pool> <volume> # launch editor\n"
-        "             cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume> # read from pool.yaml\n"
-        "\n"
-        "lxc storage volume attach [<remote>:]<pool> <volume> <container> [device name] <path>\n"
-        "lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> [device name] <path>\n"
-        "\n"
-        "lxc storage volume detach [<remote>:]<pool> <volume> <container> [device name]\n"
-        "lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> [device name]\n"
-        "\n"
-        "\n"
-        "Unless specified through a prefix, all volume operations affect \"custom\" (user created) volumes.\n"
-        "\n"
-        "Examples:\n"
-        "To show the properties of a custom volume called \"data\" in the \"default\" pool:\n"
-        "    lxc storage volume show default data\n"
-        "\n"
-        "To show the properties of the filesystem for a container called \"data\" in the \"default\" pool:\n"
-        "    lxc storage volume show default container/data\n"
-msgstr  ""
-
-#: lxc/image.go:62
-msgid   "Manipulate container images.\n"
-        "\n"
-        "In LXD containers are created from images. Those images were themselves\n"
-        "either generated from an existing container or downloaded from an image\n"
-        "server.\n"
-        "\n"
-        "When using remote images, LXD will automatically cache images for you\n"
-        "and remove them upon expiration.\n"
-        "\n"
-        "The image unique identifier is the hash (sha-256) of its representation\n"
-        "as a compressed tarball (or for split images, the concatenation of the\n"
-        "metadata and rootfs tarballs).\n"
-        "\n"
-        "Images can be referenced by their full hash, shortest unique partial\n"
-        "hash or alias name (if one is set).\n"
-        "\n"
-        "\n"
-        "lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] [--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] [--alias=ALIAS...] [prop=value]\n"
-        "    Import an image tarball (or tarballs) into the LXD image store.\n"
-        "\n"
-        "lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-aliases] [--public] [--auto-update]\n"
-        "    Copy an image from one LXD daemon to another over the network.\n"
-        "\n"
-        "    The auto-update flag instructs the server to keep this image up to\n"
-        "    date. It requires the source to be an alias and for it to be public.\n"
-        "\n"
-        "lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
-        "    Delete one or more images from the LXD image store.\n"
-        "\n"
-        "lxc image export [<remote>:]<image> [target]\n"
-        "    Export an image from the LXD image store into a distributable tarball.\n"
-        "\n"
-        "    The output target is optional and defaults to the working directory.\n"
-        "    The target may be an existing directory, file name, or \"-\" to specify\n"
-        "    stdout.  The target MUST be a directory when exporting a split image.\n"
-        "    If the target is a directory, the image's name (each part's name for\n"
-        "    split images) as found in the database will be used for the exported\n"
-        "    image.  If the target is a file (not a directory and not stdout), then\n"
-        "    the appropriate extension will be appended to the provided file name\n"
-        "    based on the algorithm used to compress the image. \n"
-        "\n"
-        "lxc image info [<remote>:]<image>\n"
-        "    Print everything LXD knows about a given image.\n"
-        "\n"
-        "lxc image list [<remote>:] [filter] [--format table|json]\n"
-        "    List images in the LXD image store. Filters may be of the\n"
-        "    <key>=<value> form for property based filtering, or part of the image\n"
-        "    hash or part of the image alias name.\n"
-        "\n"
-        "lxc image show [<remote>:]<image>\n"
-        "    Yaml output of the user modifiable properties of an image.\n"
-        "\n"
-        "lxc image edit [<remote>:]<image>\n"
-        "    Edit image, either by launching external editor or reading STDIN.\n"
-        "    Example: lxc image edit <image> # launch editor\n"
-        "             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
-        "\n"
-        "lxc image alias create [<remote>:]<alias> <fingerprint>\n"
-        "    Create a new alias for an existing image.\n"
-        "\n"
-        "lxc image alias delete [<remote>:]<alias>\n"
-        "    Delete an alias.\n"
-        "\n"
-        "lxc image alias list [<remote>:] [filter]\n"
-        "    List the aliases. Filters may be part of the image hash or part of the image alias name."
-msgstr  ""
-
-#: lxc/info.go:161
+#: lxc/info.go:163
 msgid   "Memory (current)"
 msgstr  ""
 
-#: lxc/info.go:165
+#: lxc/info.go:167
 msgid   "Memory (peak)"
 msgstr  ""
 
-#: lxc/info.go:177
+#: lxc/info.go:179
 msgid   "Memory usage:"
 msgstr  ""
 
-#: lxc/help.go:87
+#: lxc/utils.go:173
 msgid   "Missing summary."
 msgstr  ""
 
-#: lxc/monitor.go:41
-msgid   "Monitor activity on the LXD server.\n"
-        "\n"
-        "lxc monitor [<remote>:] [--type=TYPE...]\n"
-        "\n"
-        "Connects to the monitoring interface of the specified LXD server.\n"
-        "\n"
-        "By default will listen to all message types.\n"
-        "Specific types to listen to can be specified with --type.\n"
-        "\n"
-        "Example:\n"
-        "    lxc monitor --type=logging"
-msgstr  ""
-
-#: lxc/network.go:224 lxc/network.go:273 lxc/storage.go:324 lxc/storage.go:424
+#: lxc/network.go:248 lxc/network.go:297 lxc/storage.go:362 lxc/storage.go:462
 msgid   "More than one device matches, specify the device name."
 msgstr  ""
 
-#: lxc/file.go:274
+#: lxc/file.go:281
 msgid   "More than one file to download, but target is not a directory"
 msgstr  ""
 
-#: lxc/move.go:16
-msgid   "Move containers within or in between lxd instances.\n"
-        "\n"
-        "lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
-        "    Move a container between two hosts, renaming it if destination name differs.\n"
-        "\n"
-        "lxc move <old name> <new name>\n"
-        "    Rename a local container.\n"
-        "\n"
-        "lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
-        "    Rename a snapshot."
-msgstr  ""
-
-#: lxc/action.go:67
+#: lxc/action.go:68
 msgid   "Must supply container name for: "
 msgstr  ""
 
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380 lxc/storage.go:569 lxc/storage.go:649
+#: lxc/list.go:433 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:394 lxc/storage.go:607 lxc/storage.go:687
 msgid   "NAME"
 msgstr  ""
 
-#: lxc/network.go:420 lxc/remote.go:354 lxc/remote.go:359
+#: lxc/network.go:444 lxc/remote.go:368 lxc/remote.go:373
 msgid   "NO"
 msgstr  ""
 
-#: lxc/info.go:89
+#: lxc/info.go:91
 #, c-format
 msgid   "Name: %s"
 msgstr  ""
 
-#: lxc/network.go:198
+#: lxc/network.go:222
 #, c-format
 msgid   "Network %s created"
 msgstr  ""
 
-#: lxc/network.go:301
+#: lxc/network.go:325
 #, c-format
 msgid   "Network %s deleted"
 msgstr  ""
 
-#: lxc/init.go:143 lxc/init.go:144
+#: lxc/init.go:141 lxc/init.go:142
 msgid   "Network name"
 msgstr  ""
 
-#: lxc/info.go:194
+#: lxc/info.go:196
 msgid   "Network usage:"
 msgstr  ""
 
-#: lxc/image.go:134 lxc/publish.go:35
+#: lxc/image.go:136 lxc/publish.go:35
 msgid   "New alias to define at target"
 msgstr  ""
 
-#: lxc/config.go:285
+#: lxc/config.go:321
 msgid   "No certificate provided to add"
 msgstr  ""
 
-#: lxc/network.go:233 lxc/network.go:282
+#: lxc/network.go:257 lxc/network.go:306
 msgid   "No device found for this network"
 msgstr  ""
 
-#: lxc/storage.go:333 lxc/storage.go:433
+#: lxc/storage.go:371 lxc/storage.go:471
 msgid   "No device found for this storage volume."
 msgstr  ""
 
-#: lxc/config.go:308
+#: lxc/config.go:344
 msgid   "No fingerprint specified."
 msgstr  ""
 
-#: lxc/storage.go:285 lxc/storage.go:369
+#: lxc/storage.go:323 lxc/storage.go:407
 msgid   "Only \"custom\" volumes can be attached to containers."
 msgstr  ""
 
-#: lxc/remote.go:120
+#: lxc/remote.go:134
 msgid   "Only https URLs are supported for simplestreams"
 msgstr  ""
 
-#: lxc/image.go:396
+#: lxc/image.go:398
 msgid   "Only https:// is supported for remote image import."
 msgstr  ""
 
-#: lxc/network.go:330 lxc/network.go:457
+#: lxc/network.go:354 lxc/network.go:481
 msgid   "Only managed networks can be modified."
 msgstr  ""
 
-#: lxc/help.go:63 lxc/main.go:112
+#: lxc/help.go:71 lxc/main.go:112 lxc/main.go:163
 msgid   "Options:"
 msgstr  ""
 
-#: lxc/image.go:507
+#: lxc/image.go:509
 #, c-format
 msgid   "Output is in %s"
 msgstr  ""
@@ -1012,243 +604,219 @@ msgstr  ""
 msgid   "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr  ""
 
-#: lxc/list.go:556
+#: lxc/list.go:580
 msgid   "PERSISTENT"
 msgstr  ""
 
-#: lxc/list.go:410
+#: lxc/list.go:434
 msgid   "PID"
 msgstr  ""
 
-#: lxc/list.go:411
+#: lxc/list.go:435
 msgid   "PROFILES"
 msgstr  ""
 
-#: lxc/remote.go:382
+#: lxc/remote.go:396
 msgid   "PROTOCOL"
 msgstr  ""
 
-#: lxc/image.go:609 lxc/remote.go:383
+#: lxc/image.go:611 lxc/remote.go:397
 msgid   "PUBLIC"
 msgstr  ""
 
-#: lxc/info.go:188
+#: lxc/info.go:190
 msgid   "Packets received"
 msgstr  ""
 
-#: lxc/info.go:189
+#: lxc/info.go:191
 msgid   "Packets sent"
 msgstr  ""
 
-#: lxc/help.go:70
+#: lxc/help.go:78
 msgid   "Path to an alternate client configuration directory"
 msgstr  ""
 
-#: lxc/help.go:71
+#: lxc/help.go:79
 msgid   "Path to an alternate server directory"
 msgstr  ""
 
-#: lxc/main.go:31
+#: lxc/main.go:202
+msgid   "Pause containers."
+msgstr  ""
+
+#: lxc/main.go:34
 msgid   "Permission denied, are you in the lxd group?"
 msgstr  ""
 
-#: lxc/info.go:106
+#: lxc/info.go:108
 #, c-format
 msgid   "Pid: %d"
 msgstr  ""
 
-#: lxc/network.go:355 lxc/profile.go:219 lxc/storage.go:498 lxc/storage.go:803
+#: lxc/network.go:379 lxc/profile.go:258 lxc/storage.go:536 lxc/storage.go:841
 msgid   "Press enter to open the editor again"
 msgstr  ""
 
-#: lxc/config.go:536 lxc/config.go:601 lxc/image.go:704
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:706
 msgid   "Press enter to start the editor again"
 msgstr  ""
 
-#: lxc/manpage.go:18
-msgid   "Print all the subcommands help."
-msgstr  ""
-
-#: lxc/help.go:65
+#: lxc/help.go:73
 msgid   "Print debug information"
 msgstr  ""
 
-#: lxc/help.go:64
+#: lxc/help.go:72
 msgid   "Print less common commands"
 msgstr  ""
 
-#: lxc/help.go:66
+#: lxc/help.go:74
 msgid   "Print verbose information"
 msgstr  ""
 
-#: lxc/version.go:18
-msgid   "Prints the version number of this client tool.\n"
-        "\n"
-        "lxc version"
-msgstr  ""
-
-#: lxc/info.go:130
+#: lxc/info.go:132
 #, c-format
 msgid   "Processes: %d"
 msgstr  ""
 
-#: lxc/profile.go:275
+#: lxc/profile.go:314
 #, c-format
 msgid   "Profile %s added to %s"
 msgstr  ""
 
-#: lxc/profile.go:170
+#: lxc/profile.go:209
 #, c-format
 msgid   "Profile %s created"
 msgstr  ""
 
-#: lxc/profile.go:240
+#: lxc/profile.go:279
 #, c-format
 msgid   "Profile %s deleted"
 msgstr  ""
 
-#: lxc/profile.go:306
+#: lxc/profile.go:345
 #, c-format
 msgid   "Profile %s removed from %s"
 msgstr  ""
 
-#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:139 lxc/init.go:140
+#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:137 lxc/init.go:138
 msgid   "Profile to apply to the new container"
 msgstr  ""
 
-#: lxc/profile.go:256
+#: lxc/profile.go:295
 #, c-format
 msgid   "Profiles %s applied to %s"
 msgstr  ""
 
-#: lxc/info.go:104
+#: lxc/info.go:106
 #, c-format
 msgid   "Profiles: %s"
 msgstr  ""
 
-#: lxc/image.go:330
+#: lxc/image.go:332
 msgid   "Properties:"
 msgstr  ""
 
-#: lxc/remote.go:54
+#: lxc/remote.go:68
 msgid   "Public image server"
 msgstr  ""
 
-#: lxc/image.go:313
+#: lxc/image.go:315
 #, c-format
 msgid   "Public: %s"
 msgstr  ""
 
-#: lxc/publish.go:27
-msgid   "Publish containers as images.\n"
-        "\n"
-        "lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--alias=ALIAS...] [prop-key=prop-value...]"
-msgstr  ""
-
-#: lxc/file.go:58 lxc/file.go:59
+#: lxc/file.go:65 lxc/file.go:66
 msgid   "Recursively push or pull files"
 msgstr  ""
 
-#: lxc/remote.go:52
+#: lxc/remote.go:66
 msgid   "Remote admin password"
 msgstr  ""
 
-#: lxc/info.go:91
+#: lxc/info.go:93
 #, c-format
 msgid   "Remote: %s"
 msgstr  ""
 
-#: lxc/delete.go:43
+#: lxc/delete.go:41
 #, c-format
 msgid   "Remove %s (yes/no): "
 msgstr  ""
 
-#: lxc/delete.go:37 lxc/delete.go:38
+#: lxc/delete.go:35 lxc/delete.go:36
 msgid   "Require user confirmation"
 msgstr  ""
 
-#: lxc/info.go:127
+#: lxc/info.go:129
 msgid   "Resources:"
 msgstr  ""
 
-#: lxc/restore.go:21
-msgid   "Restore a container's state to a previous snapshot.\n"
-        "\n"
-        "lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
-        "\n"
-        "Restores a container from a snapshot (optionally with running state, see\n"
-        "snapshot help for details).\n"
-        "\n"
-        "Examples:\n"
-        "Create the snapshot:\n"
-        "    lxc snapshot u1 snap0\n"
-        "\n"
-        "Restore the snapshot:\n"
-        "    lxc restore u1 snap0"
+#: lxc/main.go:210
+msgid   "Restart containers."
 msgstr  ""
 
-#: lxc/init.go:256
+#: lxc/init.go:254
 #, c-format
 msgid   "Retrieving image: %s"
 msgstr  ""
 
-#: lxc/image.go:612
+#: lxc/image.go:614
 msgid   "SIZE"
 msgstr  ""
 
-#: lxc/list.go:412
+#: lxc/list.go:436
 msgid   "SNAPSHOTS"
 msgstr  ""
 
-#: lxc/storage.go:571
+#: lxc/storage.go:609
 msgid   "SOURCE"
 msgstr  ""
 
-#: lxc/list.go:413
+#: lxc/list.go:437
 msgid   "STATE"
 msgstr  ""
 
-#: lxc/remote.go:384
+#: lxc/remote.go:398
 msgid   "STATIC"
 msgstr  ""
 
-#: lxc/list.go:415
+#: lxc/list.go:439
 msgid   "STORAGE POOL"
 msgstr  ""
 
-#: lxc/remote.go:225
+#: lxc/remote.go:239
 msgid   "Server certificate NACKed by user"
 msgstr  ""
 
-#: lxc/remote.go:287
+#: lxc/remote.go:301
 msgid   "Server doesn't trust us after adding our cert"
 msgstr  ""
 
-#: lxc/remote.go:53
+#: lxc/remote.go:67
 msgid   "Server protocol (lxd or simplestreams)"
 msgstr  ""
 
-#: lxc/file.go:56
+#: lxc/file.go:63
 msgid   "Set the file's gid on push"
 msgstr  ""
 
-#: lxc/file.go:57
+#: lxc/file.go:64
 msgid   "Set the file's perms on push"
 msgstr  ""
 
-#: lxc/file.go:55
+#: lxc/file.go:62
 msgid   "Set the file's uid on push"
 msgstr  ""
 
-#: lxc/help.go:32
+#: lxc/help.go:29
 msgid   "Show all commands (not just interesting ones)"
 msgstr  ""
 
-#: lxc/help.go:67
+#: lxc/help.go:75
 msgid   "Show client version"
 msgstr  ""
 
-#: lxc/info.go:36
+#: lxc/info.go:38
 msgid   "Show the container's last 100 log lines?"
 msgstr  ""
 
@@ -1256,83 +824,91 @@ msgstr  ""
 msgid   "Show the expanded configuration"
 msgstr  ""
 
-#: lxc/image.go:311
+#: lxc/image.go:313
 #, c-format
 msgid   "Size: %.2fMB"
 msgstr  ""
 
-#: lxc/info.go:208
+#: lxc/info.go:210
 msgid   "Snapshots:"
 msgstr  ""
 
-#: lxc/action.go:133
+#: lxc/action.go:134
 #, c-format
 msgid   "Some containers failed to %s"
 msgstr  ""
 
-#: lxc/image.go:340
+#: lxc/image.go:342
 msgid   "Source:"
 msgstr  ""
 
-#: lxc/launch.go:148
+#: lxc/main.go:220
+msgid   "Start containers."
+msgstr  ""
+
+#: lxc/launch.go:146
 #, c-format
 msgid   "Starting %s"
 msgstr  ""
 
-#: lxc/info.go:98
+#: lxc/info.go:100
 #, c-format
 msgid   "Status: %s"
 msgstr  ""
 
+#: lxc/main.go:226
+msgid   "Stop containers."
+msgstr  ""
+
 #: lxc/publish.go:36 lxc/publish.go:37
 msgid   "Stop the container if currently running"
 msgstr  ""
 
-#: lxc/delete.go:107 lxc/publish.go:114
+#: lxc/delete.go:105 lxc/publish.go:114
 msgid   "Stopping container failed!"
 msgstr  ""
 
-#: lxc/storage.go:398
+#: lxc/storage.go:436
 #, c-format
 msgid   "Storage pool %s created"
 msgstr  ""
 
-#: lxc/storage.go:448
+#: lxc/storage.go:486
 #, c-format
 msgid   "Storage pool %s deleted"
 msgstr  ""
 
-#: lxc/init.go:145 lxc/init.go:146
+#: lxc/init.go:143 lxc/init.go:144
 msgid   "Storage pool name"
 msgstr  ""
 
-#: lxc/storage.go:672
+#: lxc/storage.go:710
 #, c-format
 msgid   "Storage volume %s created"
 msgstr  ""
 
-#: lxc/storage.go:682
+#: lxc/storage.go:720
 #, c-format
 msgid   "Storage volume %s deleted"
 msgstr  ""
 
-#: lxc/action.go:48
+#: lxc/action.go:49
 msgid   "Store the container state (only for stop)"
 msgstr  ""
 
-#: lxc/info.go:169
+#: lxc/info.go:171
 msgid   "Swap (current)"
 msgstr  ""
 
-#: lxc/info.go:173
+#: lxc/info.go:175
 msgid   "Swap (peak)"
 msgstr  ""
 
-#: lxc/list.go:414 lxc/network.go:435 lxc/storage.go:648
+#: lxc/list.go:438 lxc/network.go:459 lxc/storage.go:686
 msgid   "TYPE"
 msgstr  ""
 
-#: lxc/delete.go:93
+#: lxc/delete.go:91
 msgid   "The container is currently running, stop it first or pass --force."
 msgstr  ""
 
@@ -1340,28 +916,28 @@ msgstr  ""
 msgid   "The container is currently running. Use --force to have it stopped and restarted."
 msgstr  ""
 
-#: lxc/init.go:329
+#: lxc/init.go:327
 msgid   "The container you are starting doesn't have any network attached to it."
 msgstr  ""
 
-#: lxc/config.go:680 lxc/config.go:692 lxc/config.go:725 lxc/config.go:743 lxc/config.go:781 lxc/config.go:799
+#: lxc/config.go:716 lxc/config.go:728 lxc/config.go:761 lxc/config.go:779 lxc/config.go:817 lxc/config.go:835
 msgid   "The device doesn't exist"
 msgstr  ""
 
-#: lxc/init.go:313
+#: lxc/init.go:311
 #, c-format
 msgid   "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr  ""
 
-#: lxc/main.go:181
-msgid   "The opposite of `lxc pause` is `lxc start`."
+#: lxc/action.go:34
+msgid   "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr  ""
 
-#: lxc/network.go:238 lxc/network.go:287 lxc/storage.go:338 lxc/storage.go:438
+#: lxc/network.go:262 lxc/network.go:311 lxc/storage.go:376 lxc/storage.go:476
 msgid   "The specified device doesn't exist"
 msgstr  ""
 
-#: lxc/network.go:242 lxc/network.go:291
+#: lxc/network.go:266 lxc/network.go:315
 msgid   "The specified device doesn't match the network"
 msgstr  ""
 
@@ -1369,99 +945,736 @@ msgstr  ""
 msgid   "There is no \"image name\".  Did you want an alias?"
 msgstr  ""
 
-#: lxc/action.go:44
+#: lxc/help.go:47
+msgid   "This is the LXD command line client.\n"
+        "\n"
+        "All of LXD's features can be driven through the various commands below.\n"
+        "For help with any of those, simply call them with --help."
+msgstr  ""
+
+#: lxc/action.go:45
 msgid   "Time to wait for the container before killing it"
 msgstr  ""
 
-#: lxc/image.go:314
+#: lxc/image.go:316
 msgid   "Timestamps:"
 msgstr  ""
 
-#: lxc/init.go:331
+#: lxc/init.go:329
 msgid   "To attach a network to a container, use: lxc network attach"
 msgstr  ""
 
-#: lxc/init.go:330
+#: lxc/init.go:328
 msgid   "To create a new network, use: lxc network create"
 msgstr  ""
 
-#: lxc/main.go:137
+#: lxc/main.go:140
 msgid   "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr  ""
 
-#: lxc/image.go:398
+#: lxc/image.go:400
 #, c-format
 msgid   "Transferring image: %s"
 msgstr  ""
 
-#: lxc/action.go:97 lxc/launch.go:161
+#: lxc/action.go:98 lxc/launch.go:159
 #, c-format
 msgid   "Try `lxc info --show-log %s` for more info"
 msgstr  ""
 
-#: lxc/info.go:100
+#: lxc/info.go:102
 msgid   "Type: ephemeral"
 msgstr  ""
 
-#: lxc/info.go:102
+#: lxc/info.go:104
 msgid   "Type: persistent"
 msgstr  ""
 
-#: lxc/image.go:613
+#: lxc/image.go:615
 msgid   "UPLOAD DATE"
 msgstr  ""
 
-#: lxc/remote.go:381
+#: lxc/remote.go:395
 msgid   "URL"
 msgstr  ""
 
-#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:461 lxc/profile.go:500 lxc/storage.go:610 lxc/storage.go:688
 msgid   "USED BY"
 msgstr  ""
 
-#: lxc/remote.go:95
+#: lxc/manpage.go:36
+msgid   "Unable to find help2man."
+msgstr  ""
+
+#: lxc/remote.go:109
 msgid   "Unable to read remote TLS certificate"
 msgstr  ""
 
-#: lxc/image.go:319
+#: lxc/image.go:321
 #, c-format
 msgid   "Uploaded: %s"
 msgstr  ""
 
-#: lxc/main.go:112
+#: lxc/action.go:37
 #, c-format
-msgid   "Usage: %s"
+msgid   "Usage: lxc %s [<remote>:]<container> [[<remote>:]<container>...]\n"
+        "\n"
+        "%s%s"
 msgstr  ""
 
-#: lxc/help.go:48
+#: lxc/help.go:45
 msgid   "Usage: lxc <command> [options]"
 msgstr  ""
 
-#: lxc/delete.go:47
+#: lxc/config.go:58
+msgid   "Usage: lxc config <subcommand> [options]\n"
+        "\n"
+        "Change container or server configuration options.\n"
+        "\n"
+        "*Container configuration*\n"
+        "\n"
+        "lxc config get [<remote>:][container] <key>\n"
+        "    Get container or server configuration key.\n"
+        "\n"
+        "lxc config set [<remote>:][container] <key> <value>\n"
+        "    Set container or server configuration key.\n"
+        "\n"
+        "lxc config unset [<remote>:][container] <key>\n"
+        "    Unset container or server configuration key.\n"
+        "\n"
+        "lxc config show [<remote>:][container] [--expanded]\n"
+        "    Show container or server configuration.\n"
+        "\n"
+        "lxc config edit [<remote>:][container]\n"
+        "    Edit configuration, either by launching external editor or reading STDIN.\n"
+        "\n"
+        "*Device management*\n"
+        "\n"
+        "lxc config device add [<remote>:]<container> <device> <type> [key=value...]\n"
+        "    Add a device to a container.\n"
+        "\n"
+        "lxc config device get [<remote>:]<container> <device> <key>\n"
+        "    Get a device property.\n"
+        "\n"
+        "lxc config device set [<remote>:]<container> <device> <key> <value>\n"
+        "    Set a device property.\n"
+        "\n"
+        "lxc config device unset [<remote>:]<container> <device> <key>\n"
+        "    Unset a device property.\n"
+        "\n"
+        "lxc config device list [<remote>:]<container>\n"
+        "    List devices for container.\n"
+        "\n"
+        "lxc config device show [<remote>:]<container>\n"
+        "    Show full device details for container.\n"
+        "\n"
+        "lxc config device remove [<remote>:]<container> <name>\n"
+        "    Remove device from container.\n"
+        "\n"
+        "*Client trust store management*\n"
+        "\n"
+        "lxc config trust list [<remote>:]\n"
+        "    List all trusted certs.\n"
+        "\n"
+        "lxc config trust add [<remote>:] <certfile.crt>\n"
+        "    Add certfile.crt to trusted hosts.\n"
+        "\n"
+        "lxc config trust remove [<remote>:] [hostname|fingerprint]\n"
+        "    Remove the cert from trusted hosts.\n"
+        "\n"
+        "*Examples*\n"
+        "\n"
+        "cat config.yaml | lxc config edit <container>\n"
+        "    Update the container configuration from config.yaml.\n"
+        "\n"
+        "lxc config device add [<remote>:]container1 <device-name> disk source=/share/c1 path=opt\n"
+        "    Will mount the host's /share/c1 onto /opt in the container.\n"
+        "\n"
+        "lxc config set [<remote>:]<container> limits.cpu 2\n"
+        "    Will set a CPU limit of \"2\" for the container.\n"
+        "\n"
+        "lxc config set core.https_address [::]:8443\n"
+        "    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+        "\n"
+        "lxc config set core.trust_password blah\n"
+        "    Will set the server's trust password to blah."
+msgstr  ""
+
+#: lxc/copy.go:25
+msgid   "Usage: lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]\n"
+        "\n"
+        "Copy containers within or in between LXD instances."
+msgstr  ""
+
+#: lxc/delete.go:26
+msgid   "Usage: lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/<snapshot>]...]\n"
+        "\n"
+        "Delete containers and snapshots."
+msgstr  ""
+
+#: lxc/exec.go:46
+msgid   "Usage: lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--env KEY=VALUE...] [--] <command line>\n"
+        "\n"
+        "Execute commands in containers.\n"
+        "\n"
+        "Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored)."
+msgstr  ""
+
+#: lxc/file.go:36
+msgid   "Usage: lxc file <subcommand> [options]\n"
+        "\n"
+        "Manage files in containers.\n"
+        "\n"
+        "lxc file pull [-r|--recursive] [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...] <target path>\n"
+        "    Pull files from containers.\n"
+        "\n"
+        "lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--mode=MODE] <source path> [<source path>...] [<remote>:]<container>/<path>\n"
+        "    Push files into containers.\n"
+        "\n"
+        "lxc file delete [<remote>:]<container>/<path> [[<remote>:]<container>/<path>...]\n"
+        "    Delete files in containers.\n"
+        "\n"
+        "lxc file edit [<remote>:]<container>/<path>\n"
+        "    Edit files in containers using the default text editor.\n"
+        "\n"
+        "*Examples*\n"
+        "lxc file push /etc/hosts foo/etc/hosts\n"
+        "   To push /etc/hosts into the container \"foo\".\n"
+        "\n"
+        "lxc file pull foo/etc/hosts .\n"
+        "   To pull /etc/hosts from the container and write it to the current directory."
+msgstr  ""
+
+#: lxc/finger.go:15
+msgid   "Usage: lxc finger [<remote>:]\n"
+        "\n"
+        "Check if the LXD server is alive."
+msgstr  ""
+
+#: lxc/help.go:22
+msgid   "Usage: lxc help [--all]\n"
+        "\n"
+        "Help page for the LXD client."
+msgstr  ""
+
+#: lxc/image.go:62
+msgid   "Usage: lxc image <subcommand> [options]\n"
+        "\n"
+        "Manipulate container images.\n"
+        "\n"
+        "In LXD containers are created from images. Those images were themselves\n"
+        "either generated from an existing container or downloaded from an image\n"
+        "server.\n"
+        "\n"
+        "When using remote images, LXD will automatically cache images for you\n"
+        "and remove them upon expiration.\n"
+        "\n"
+        "The image unique identifier is the hash (sha-256) of its representation\n"
+        "as a compressed tarball (or for split images, the concatenation of the\n"
+        "metadata and rootfs tarballs).\n"
+        "\n"
+        "Images can be referenced by their full hash, shortest unique partial\n"
+        "hash or alias name (if one is set).\n"
+        "\n"
+        "\n"
+        "lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] [--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] [--alias=ALIAS...] [prop=value]\n"
+        "    Import an image tarball (or tarballs) into the LXD image store.\n"
+        "\n"
+        "lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-aliases] [--public] [--auto-update]\n"
+        "    Copy an image from one LXD daemon to another over the network.\n"
+        "\n"
+        "    The auto-update flag instructs the server to keep this image up to\n"
+        "    date. It requires the source to be an alias and for it to be public.\n"
+        "\n"
+        "lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
+        "    Delete one or more images from the LXD image store.\n"
+        "\n"
+        "lxc image export [<remote>:]<image> [target]\n"
+        "    Export an image from the LXD image store into a distributable tarball.\n"
+        "\n"
+        "    The output target is optional and defaults to the working directory.\n"
+        "    The target may be an existing directory, file name, or \"-\" to specify\n"
+        "    stdout.  The target MUST be a directory when exporting a split image.\n"
+        "    If the target is a directory, the image's name (each part's name for\n"
+        "    split images) as found in the database will be used for the exported\n"
+        "    image.  If the target is a file (not a directory and not stdout), then\n"
+        "    the appropriate extension will be appended to the provided file name\n"
+        "    based on the algorithm used to compress the image. \n"
+        "\n"
+        "lxc image info [<remote>:]<image>\n"
+        "    Print everything LXD knows about a given image.\n"
+        "\n"
+        "lxc image list [<remote>:] [filter] [--format table|json]\n"
+        "    List images in the LXD image store. Filters may be of the\n"
+        "    <key>=<value> form for property based filtering, or part of the image\n"
+        "    hash or part of the image alias name.\n"
+        "\n"
+        "lxc image show [<remote>:]<image>\n"
+        "    Yaml output of the user modifiable properties of an image.\n"
+        "\n"
+        "lxc image edit [<remote>:]<image>\n"
+        "    Edit image, either by launching external editor or reading STDIN.\n"
+        "    Example: lxc image edit <image> # launch editor\n"
+        "             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
+        "\n"
+        "lxc image alias create [<remote>:]<alias> <fingerprint>\n"
+        "    Create a new alias for an existing image.\n"
+        "\n"
+        "lxc image alias delete [<remote>:]<alias>\n"
+        "    Delete an alias.\n"
+        "\n"
+        "lxc image alias list [<remote>:] [filter]\n"
+        "    List the aliases. Filters may be part of the image hash or part of the image alias name."
+msgstr  ""
+
+#: lxc/info.go:25
+msgid   "Usage: lxc info [<remote>:][<container>] [--show-log]\n"
+        "\n"
+        "Show container or server information.\n"
+        "\n"
+        "lxc info [<remote>:]<container> [--show-log]\n"
+        "    For container information.\n"
+        "\n"
+        "lxc info [<remote>:]\n"
+        "    For LXD server information."
+msgstr  ""
+
+#: lxc/init.go:75
+msgid   "Usage: lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--storage|-s <pool>]\n"
+        "\n"
+        "Create containers from images.\n"
+        "\n"
+        "Not specifying -p will result in the default profile.\n"
+        "Specifying \"-p\" with no argument will result in no profile.\n"
+        "\n"
+        "Examples:\n"
+        "    lxc init ubuntu:16.04 u1"
+msgstr  ""
+
+#: lxc/launch.go:23
+msgid   "Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--storage|-s <pool>]\n"
+        "\n"
+        "Create and start containers from images.\n"
+        "\n"
+        "Not specifying -p will result in the default profile.\n"
+        "Specifying \"-p\" with no argument will result in no profile.\n"
+        "\n"
+        "Examples:\n"
+        "    lxc launch ubuntu:16.04 u1"
+msgstr  ""
+
+#: lxc/list.go:47
+msgid   "Usage: lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--fast]\n"
+        "\n"
+        "List the existing containers.\n"
+        "\n"
+        "Default column layout: ns46tS\n"
+        "Fast column layout: nsacPt\n"
+        "\n"
+        "*Filters*\n"
+        "A single keyword like \"web\" which will list any container with a name starting by \"web\".\n"
+        "\n"
+        "A regular expression on the container name. (e.g. .*web.*01$).\n"
+        "\n"
+        "A key/value pair referring to a configuration item. For those, the namespace can be abbreviated to the smallest unambiguous identifier.\n"
+        "    - \"user.blah=abc\" will list all containers with the \"blah\" user property set to \"abc\".\n"
+        "\n"
+        "    - \"u.blah=abc\" will do the same\n"
+        "\n"
+        "    - \"security.privileged=1\" will list all privileged containers\n"
+        "\n"
+        "    - \"s.privileged=1\" will do the same\n"
+        "\n"
+        "A regular expression matching a configuration item or its value. (e.g. volatile.eth0.hwaddr=00:16:3e:.*).\n"
+        "\n"
+        "*Columns*\n"
+        "The -c option takes a comma separated list of arguments that control\n"
+        "which container attributes to output when displaying in table format.\n"
+        "\n"
+        "Column arguments are either pre-defined shorthand chars (see below),\n"
+        "or (extended) config keys.\n"
+        "\n"
+        "Commas between consecutive shorthand chars are optional.\n"
+        "\n"
+        "Pre-defined column shorthand chars:\n"
+        "\n"
+        "    4 - IPv4 address\n"
+        "\n"
+        "    6 - IPv6 address\n"
+        "\n"
+        "    a - Architecture\n"
+        "\n"
+        "    b - Storage pool\n"
+        "\n"
+        "    c - Creation date\n"
+        "\n"
+        "    l - Last used date\n"
+        "\n"
+        "    n - Name\n"
+        "\n"
+        "    p - PID of the container's init process\n"
+        "\n"
+        "    P - Profiles\n"
+        "\n"
+        "    s - State\n"
+        "\n"
+        "    S - Number of snapshots\n"
+        "\n"
+        "    t - Type (persistent or ephemeral)\n"
+        "\n"
+        "Custom columns are defined with \"key[:name][:maxWidth]\":\n"
+        "\n"
+        "    KEY: The (extended) config key to display\n"
+        "\n"
+        "    NAME: Name to display in the column header.\n"
+        "    Defaults to the key if not specified or empty.\n"
+        "\n"
+        "    MAXWIDTH: Max width of the column (longer results are truncated).\n"
+        "    Defaults to -1 (unlimited). Use 0 to limit to the column header size.\n"
+        "\n"
+        "*Examples*\n"
+        "lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:MAC\n"
+        "    Shows a list of containers using the \"NAME\", \"BASE IMAGE\", \"STATE\", \"IPV4\",\n"
+        "    \"IPV6\" and \"MAC\" columns.\n"
+        "\n"
+        "    \"BASE IMAGE\" and \"MAC\" are custom columns generated from container configuration keys."
+msgstr  ""
+
+#: lxc/manpage.go:20
+msgid   "Usage: lxc manpage <directory>\n"
+        "\n"
+        "Generate all the LXD manpages."
+msgstr  ""
+
+#: lxc/monitor.go:41
+msgid   "Usage: lxc monitor [<remote>:] [--type=TYPE...]\n"
+        "\n"
+        "Monitor a local or remote LXD server.\n"
+        "\n"
+        "By default the monitor will listen to all message types.\n"
+        "\n"
+        "Message types to listen for can be specified with --type.\n"
+        "\n"
+        "*Examples*\n"
+        "lxc monitor --type=logging\n"
+        "    Only show log message."
+msgstr  ""
+
+#: lxc/move.go:16
+msgid   "Usage: lxc move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/<snapshot>]]\n"
+        "\n"
+        "Move containers within or in between LXD instances.\n"
+        "\n"
+        "lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
+        "    Move a container between two hosts, renaming it if destination name differs.\n"
+        "\n"
+        "lxc move <old name> <new name>\n"
+        "    Rename a local container.\n"
+        "\n"
+        "lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+        "    Rename a snapshot."
+msgstr  ""
+
+#: lxc/network.go:49
+msgid   "Usage: lxc network <subcommand> [options]\n"
+        "\n"
+        "Manage and attach containers to networks.\n"
+        "\n"
+        "lxc network list [<remote>:]\n"
+        "    List available networks.\n"
+        "\n"
+        "lxc network show [<remote>:]<network>\n"
+        "    Show details of a network.\n"
+        "\n"
+        "lxc network create [<remote>:]<network> [key=value...]\n"
+        "    Create a network.\n"
+        "\n"
+        "lxc network get [<remote>:]<network> <key>\n"
+        "    Get network configuration.\n"
+        "\n"
+        "lxc network set [<remote>:]<network> <key> <value>\n"
+        "    Set network configuration.\n"
+        "\n"
+        "lxc network unset [<remote>:]<network> <key>\n"
+        "    Unset network configuration.\n"
+        "\n"
+        "lxc network delete [<remote>:]<network>\n"
+        "    Delete a network.\n"
+        "\n"
+        "lxc network edit [<remote>:]<network>\n"
+        "    Edit network, either by launching external editor or reading STDIN.\n"
+        "\n"
+        "lxc network attach [<remote>:]<network> <container> [device name] [interface name]\n"
+        "    Attach a network interface connecting the network to a specified container.\n"
+        "\n"
+        "lxc network attach-profile [<remote>:]<network> <profile> [device name] [interface name]\n"
+        "    Attach a network interface connecting the network to a specified profile.\n"
+        "\n"
+        "lxc network detach [<remote>:]<network> <container> [device name]\n"
+        "    Remove a network interface connecting the network to a specified container.\n"
+        "\n"
+        "lxc network detach-profile [<remote>:]<network> <container> [device name]\n"
+        "    Remove a network interface connecting the network to a specified profile.\n"
+        "\n"
+        "*Examples*\n"
+        "cat network.yaml | lxc network edit <network>\n"
+        "    Update a network using the content of network.yaml"
+msgstr  ""
+
+#: lxc/profile.go:49
+msgid   "Usage: lxc profile <subcommand> [options]\n"
+        "\n"
+        "Manage container configuration profiles.\n"
+        "\n"
+        "*Profile configuration*\n"
+        "lxc profile list [<remote>:]\n"
+        "    List available profiles.\n"
+        "\n"
+        "lxc profile show [<remote>:]<profile>\n"
+        "    Show details of a profile.\n"
+        "\n"
+        "lxc profile create [<remote>:]<profile>\n"
+        "    Create a profile.\n"
+        "\n"
+        "lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
+        "    Copy the profile.\n"
+        "\n"
+        "lxc profile get [<remote>:]<profile> <key>\n"
+        "    Get profile configuration.\n"
+        "\n"
+        "lxc profile set [<remote>:]<profile> <key> <value>\n"
+        "    Set profile configuration.\n"
+        "\n"
+        "lxc profile unset [<remote>:]<profile> <key>\n"
+        "    Unset profile configuration.\n"
+        "\n"
+        "lxc profile delete [<remote>:]<profile>\n"
+        "    Delete a profile.\n"
+        "\n"
+        "lxc profile edit [<remote>:]<profile>\n"
+        "    Edit profile, either by launching external editor or reading STDIN.\n"
+        "\n"
+        "*Profile assignment*\n"
+        "lxc profile assign [<remote>:]<container> <profiles>\n"
+        "    Replace the current set of profiles for the container by the one provided.\n"
+        "\n"
+        "lxc profile add [<remote>:]<container> <profile>\n"
+        "    Add a profile to a container\n"
+        "\n"
+        "lxc profile remove [<remote>:]<container> <profile>\n"
+        "    Remove the profile from a container\n"
+        "\n"
+        "*Device management*\n"
+        "lxc profile device list [<remote>:]<profile>\n"
+        "    List devices in the given profile.\n"
+        "\n"
+        "lxc profile device show [<remote>:]<profile>\n"
+        "    Show full device details in the given profile.\n"
+        "\n"
+        "lxc profile device remove [<remote>:]<profile> <name>\n"
+        "    Remove a device from a profile.\n"
+        "\n"
+        "lxc profile device get [<remote>:]<profile> <name> <key>\n"
+        "    Get a device property.\n"
+        "\n"
+        "lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
+        "    Set a device property.\n"
+        "\n"
+        "lxc profile device unset [<remote>:]<profile> <name> <key>\n"
+        "    Unset a device property.\n"
+        "\n"
+        "lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
+        "    Add a profile device, such as a disk or a nic, to the containers using the specified profile.\n"
+        "\n"
+        "*Examples*\n"
+        "cat profile.yaml | lxc profile edit <profile>\n"
+        "    Update a profile using the content of profile.yaml\n"
+        "\n"
+        "lxc profile assign foo default,bar\n"
+        "    Set the profiles for \"foo\" to \"default\" and \"bar\".\n"
+        "\n"
+        "lxc profile assign foo default\n"
+        "    Reset \"foo\" to only using the \"default\" profile.\n"
+        "\n"
+        "lxc profile assign foo ''\n"
+        "    Remove all profile from \"foo\""
+msgstr  ""
+
+#: lxc/publish.go:27
+msgid   "Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--alias=ALIAS...] [prop-key=prop-value...]\n"
+        "\n"
+        "Publish containers as images."
+msgstr  ""
+
+#: lxc/remote.go:37
+msgid   "Usage: lxc remote <subcommand> [options]\n"
+        "\n"
+        "Manage the list of remote LXD servers.\n"
+        "\n"
+        "lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--password=PASSWORD] [--public] [--protocol=PROTOCOL]\n"
+        "    Add the remote <remote> at <url>.\n"
+        "\n"
+        "lxc remote remove <remote>\n"
+        "    Remove the remote <remote>.\n"
+        "\n"
+        "lxc remote list\n"
+        "    List all remotes.\n"
+        "\n"
+        "lxc remote rename <old name> <new name>\n"
+        "    Rename remote <old name> to <new name>.\n"
+        "\n"
+        "lxc remote set-url <remote> <url>\n"
+        "    Update <remote>'s url to <url>.\n"
+        "\n"
+        "lxc remote set-default <remote>\n"
+        "    Set the default remote.\n"
+        "\n"
+        "lxc remote get-default\n"
+        "    Print the default remote."
+msgstr  ""
+
+#: lxc/restore.go:21
+msgid   "Usage: lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+        "\n"
+        "Restore containers from snapshots.\n"
+        "\n"
+        "If --stateful is passed, then the running state will be restored too.\n"
+        "\n"
+        "*Examples*\n"
+        "lxc snapshot u1 snap0\n"
+        "    Create the snapshot.\n"
+        "\n"
+        "lxc restore u1 snap0\n"
+        "    Restore the snapshot."
+msgstr  ""
+
+#: lxc/snapshot.go:21
+msgid   "Usage: lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+        "\n"
+        "Create container snapshots.\n"
+        "\n"
+        "When --stateful is used, LXD attempts to checkpoint the container's\n"
+        "running state, including process memory state, TCP connections, ...\n"
+        "\n"
+        "*Examples*\n"
+        "lxc snapshot u1 snap0\n"
+        "    Create a snapshot of \"u1\" called \"snap0\"."
+msgstr  ""
+
+#: lxc/storage.go:61
+msgid   "Usage: lxc storage <subcommand> [options]\n"
+        "\n"
+        "Manage storage pools and volumes.\n"
+        "\n"
+        "*Storage pools*\n"
+        "lxc storage list [<remote>:]\n"
+        "    List available storage pools.\n"
+        "\n"
+        "lxc storage show [<remote>:]<pool>\n"
+        "    Show details of a storage pool.\n"
+        "\n"
+        "lxc storage create [<remote>:]<pool> <driver> [key=value]...\n"
+        "    Create a storage pool.\n"
+        "\n"
+        "lxc storage get [<remote>:]<pool> <key>\n"
+        "    Get storage pool configuration.\n"
+        "\n"
+        "lxc storage set [<remote>:]<pool> <key> <value>\n"
+        "    Set storage pool configuration.\n"
+        "\n"
+        "lxc storage unset [<remote>:]<pool> <key>\n"
+        "    Unset storage pool configuration.\n"
+        "\n"
+        "lxc storage delete [<remote>:]<pool>\n"
+        "    Delete a storage pool.\n"
+        "\n"
+        "lxc storage edit [<remote>:]<pool>\n"
+        "    Edit storage pool, either by launching external editor or reading STDIN.\n"
+        "\n"
+        "*Storage volumes*\n"
+        "lxc storage volume list [<remote>:]<pool>\n"
+        "    List available storage volumes on a storage pool.\n"
+        "\n"
+        "lxc storage volume show [<remote>:]<pool> <volume>\n"
+        "    Show details of a storage volume on a storage pool.\n"
+        "\n"
+        "lxc storage volume create [<remote>:]<pool> <volume> [key=value]...\n"
+        "    Create a storage volume on a storage pool.\n"
+        "\n"
+        "lxc storage volume get [<remote>:]<pool> <volume> <key>\n"
+        "    Get storage volume configuration on a storage pool.\n"
+        "\n"
+        "lxc storage volume set [<remote>:]<pool> <volume> <key> <value>\n"
+        "    Set storage volume configuration on a storage pool.\n"
+        "\n"
+        "lxc storage volume unset [<remote>:]<pool> <volume> <key>\n"
+        "    Unset storage volume configuration on a storage pool.\n"
+        "\n"
+        "lxc storage volume delete [<remote>:]<pool> <volume>\n"
+        "    Delete a storage volume on a storage pool.\n"
+        "\n"
+        "lxc storage volume edit [<remote>:]<pool> <volume>\n"
+        "    Edit storage pool, either by launching external editor or reading STDIN.\n"
+        "\n"
+        "lxc storage volume attach [<remote>:]<pool> <volume> <container> [device name] <path>\n"
+        "    Attach a storage volume to the specified container.\n"
+        "\n"
+        "lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> [device name] <path>\n"
+        "    Attach a storage volume to the specified profile.\n"
+        "\n"
+        "lxc storage volume detach [<remote>:]<pool> <volume> <container> [device name]\n"
+        "    Detach a storage volume from the specified container.\n"
+        "\n"
+        "lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> [device name]\n"
+        "    Detach a storage volume from the specified profile.\n"
+        "\n"
+        "Unless specified through a prefix, all volume operations affect \"custom\" (user created) volumes.\n"
+        "\n"
+        "*Examples*\n"
+        "cat pool.yaml | lxc storage edit [<remote>:]<pool>\n"
+        "    Update a storage pool using the content of pool.yaml.\n"
+        "\n"
+        "cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume>\n"
+        "    Update a storage volume using the content of pool.yaml.\n"
+        "\n"
+        "lxc storage volume show default data\n"
+        "    Will show the properties of a custom volume called \"data\" in the \"default\" pool.\n"
+        "\n"
+        "lxc storage volume show default container/data\n"
+        "    Will show the properties of the filesystem for a container called \"data\" in the \"default\" pool."
+msgstr  ""
+
+#: lxc/version.go:18
+msgid   "Usage: lxc version\n"
+        "\n"
+        "Print the version number of this client tool."
+msgstr  ""
+
+#: lxc/delete.go:45
 msgid   "User aborted delete operation."
 msgstr  ""
 
-#: lxc/restore.go:38
+#: lxc/restore.go:37
 msgid   "Whether or not to restore the container's running state from snapshot (if available)"
 msgstr  ""
 
-#: lxc/snapshot.go:38
+#: lxc/snapshot.go:35
 msgid   "Whether or not to snapshot the container's running state"
 msgstr  ""
 
-#: lxc/network.go:422 lxc/remote.go:356 lxc/remote.go:361
+#: lxc/network.go:446 lxc/remote.go:370 lxc/remote.go:375
 msgid   "YES"
 msgstr  ""
 
-#: lxc/main.go:52
+#: lxc/main.go:55
 msgid   "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr  ""
 
-#: lxc/launch.go:132
+#: lxc/launch.go:130
 msgid   "bad number of things scanned from image, container or snapshot"
 msgstr  ""
 
-#: lxc/action.go:93
+#: lxc/action.go:94
 msgid   "bad result type from action"
 msgstr  ""
 
@@ -1469,49 +1682,49 @@ msgstr  ""
 msgid   "can't copy to the same container name"
 msgstr  ""
 
-#: lxc/file.go:309
+#: lxc/file.go:316
 msgid   "can't pull a directory without --recursive"
 msgstr  ""
 
-#: lxc/remote.go:344
+#: lxc/remote.go:358
 msgid   "can't remove the default remote"
 msgstr  ""
 
-#: lxc/file.go:120
+#: lxc/file.go:127
 msgid   "can't supply uid/gid/mode in recursive mode"
 msgstr  ""
 
-#: lxc/remote.go:370
+#: lxc/remote.go:384
 msgid   "default"
 msgstr  ""
 
-#: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238 lxc/init.go:236 lxc/init.go:241 lxc/launch.go:116 lxc/launch.go:121
+#: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238 lxc/init.go:234 lxc/init.go:239 lxc/launch.go:114 lxc/launch.go:119
 msgid   "didn't get any affected image, container or snapshot from server"
 msgstr  ""
 
-#: lxc/image.go:305
+#: lxc/image.go:307
 msgid   "disabled"
 msgstr  ""
 
-#: lxc/image.go:307
+#: lxc/image.go:309
 msgid   "enabled"
 msgstr  ""
 
-#: lxc/action.go:125 lxc/main.go:22 lxc/main.go:148
+#: lxc/action.go:126 lxc/main.go:25 lxc/main.go:159
 #, c-format
 msgid   "error: %v"
 msgstr  ""
 
-#: lxc/help.go:40 lxc/main.go:107
+#: lxc/help.go:37 lxc/main.go:106
 #, c-format
 msgid   "error: unknown command: %s"
 msgstr  ""
 
-#: lxc/launch.go:136
+#: lxc/launch.go:134
 msgid   "got bad version"
 msgstr  ""
 
-#: lxc/image.go:300 lxc/image.go:589
+#: lxc/image.go:302 lxc/image.go:591
 msgid   "no"
 msgstr  ""
 
@@ -1519,48 +1732,48 @@ msgstr  ""
 msgid   "not all the profiles from the source exist on the target"
 msgstr  ""
 
-#: lxc/remote.go:218
+#: lxc/remote.go:232
 msgid   "ok (y/n)?"
 msgstr  ""
 
-#: lxc/main.go:305 lxc/main.go:309
+#: lxc/main.go:331 lxc/main.go:335
 #, c-format
 msgid   "processing aliases failed %s\n"
 msgstr  ""
 
-#: lxc/file.go:376
+#: lxc/file.go:383
 msgid   "recursive edit doesn't make sense :("
 msgstr  ""
 
-#: lxc/remote.go:406
+#: lxc/remote.go:420
 #, c-format
 msgid   "remote %s already exists"
 msgstr  ""
 
-#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
+#: lxc/remote.go:350 lxc/remote.go:412 lxc/remote.go:447 lxc/remote.go:463
 #, c-format
 msgid   "remote %s doesn't exist"
 msgstr  ""
 
-#: lxc/remote.go:319
+#: lxc/remote.go:333
 #, c-format
 msgid   "remote %s exists as <%s>"
 msgstr  ""
 
-#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
+#: lxc/remote.go:354 lxc/remote.go:416 lxc/remote.go:451
 #, c-format
 msgid   "remote %s is static and cannot be modified"
 msgstr  ""
 
-#: lxc/info.go:219
+#: lxc/info.go:221
 msgid   "stateful"
 msgstr  ""
 
-#: lxc/info.go:221
+#: lxc/info.go:223
 msgid   "stateless"
 msgstr  ""
 
-#: lxc/info.go:215
+#: lxc/info.go:217
 #, c-format
 msgid   "taken at %s"
 msgstr  ""
@@ -1569,11 +1782,11 @@ msgstr  ""
 msgid   "unreachable return reached"
 msgstr  ""
 
-#: lxc/main.go:237
+#: lxc/main.go:262
 msgid   "wrong number of subcommand arguments"
 msgstr  ""
 
-#: lxc/delete.go:46 lxc/image.go:302 lxc/image.go:593
+#: lxc/delete.go:44 lxc/image.go:304 lxc/image.go:595
 msgid   "yes"
 msgstr  ""
 
diff --git a/po/nl.po b/po/nl.po
index eb9bea5..e78ba4c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-03-05 02:20-0500\n"
+"POT-Creation-Date: 2017-03-05 02:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -119,135 +119,120 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:586
+#: lxc/image.go:588
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/snapshot.go:61
+#: lxc/snapshot.go:58
 msgid "'/' not allowed in snapshot name"
 msgstr ""
 
-#: lxc/profile.go:254
+#: lxc/profile.go:293
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:607 lxc/image.go:649
+#: lxc/image.go:609 lxc/image.go:651
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:611
+#: lxc/image.go:613
 msgid "ARCH"
 msgstr ""
 
-#: lxc/list.go:406
+#: lxc/list.go:430
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:51
+#: lxc/remote.go:65
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:267
+#: lxc/remote.go:281
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:334
+#: lxc/image.go:336
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:312 lxc/info.go:93
+#: lxc/image.go:314 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:338
+#: lxc/image.go:340
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/help.go:49
-msgid "Available commands:"
-msgstr ""
-
-#: lxc/info.go:186
+#: lxc/info.go:188
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:187
+#: lxc/info.go:189
 msgid "Bytes sent"
 msgstr ""
 
-#: lxc/config.go:274
+#: lxc/config.go:310
 msgid "COMMON NAME"
 msgstr ""
 
-#: lxc/info.go:150
+#: lxc/info.go:152
 msgid "CPU usage (in seconds)"
 msgstr ""
 
-#: lxc/info.go:154
+#: lxc/info.go:156
 msgid "CPU usage:"
 msgstr ""
 
-#: lxc/list.go:407
+#: lxc/list.go:431
 msgid "CREATED AT"
 msgstr ""
 
-#: lxc/config.go:114 lxc/network.go:471
+#: lxc/config.go:150 lxc/network.go:495
 #, c-format
 msgid "Can't read from stdin: %s"
 msgstr ""
 
-#: lxc/config.go:127 lxc/config.go:160 lxc/config.go:182
+#: lxc/config.go:163 lxc/config.go:196 lxc/config.go:218
 #, c-format
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
+#: lxc/network.go:422 lxc/profile.go:472 lxc/storage.go:579
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:217
+#: lxc/remote.go:231
 #, c-format
 msgid "Certificate fingerprint: %x"
 msgstr ""
 
-#: lxc/action.go:36
-#, c-format
-msgid ""
-"Change state of one or more containers to %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-msgstr ""
-
-#: lxc/finger.go:15
-msgid ""
-"Check if the LXD instance is up.\n"
-"\n"
-"lxc finger [<remote>:]"
-msgstr ""
-
-#: lxc/remote.go:290
+#: lxc/remote.go:304
 msgid "Client certificate stored at server: "
 msgstr ""
 
-#: lxc/list.go:101 lxc/list.go:102
+#: lxc/list.go:125 lxc/list.go:126
 msgid "Columns"
 msgstr ""
 
-#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:137 lxc/init.go:138
+#: lxc/help.go:53
+msgid "Commands:"
+msgstr ""
+
+#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:135 lxc/init.go:136
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:535 lxc/config.go:600 lxc/image.go:703 lxc/network.go:354
-#: lxc/profile.go:218 lxc/storage.go:497 lxc/storage.go:802
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:705 lxc/network.go:378
+#: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:840
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
 
-#: lxc/main.go:29
+#: lxc/main.go:32
 msgid "Connection refused; is LXD running?"
 msgstr ""
 
@@ -255,7 +240,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:246
+#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:244
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -265,75 +250,47 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:132
+#: lxc/image.go:134
 msgid "Copy aliases from source"
 msgstr ""
 
-#: lxc/copy.go:25
-msgid ""
-"Copy containers within or in between LXD instances.\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
-"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-msgstr ""
-
-#: lxc/image.go:245
+#: lxc/image.go:247
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:232
+#: lxc/remote.go:246
 msgid "Could not create server cert dir"
 msgstr ""
 
-#: lxc/file.go:84
+#: lxc/file.go:91
 #, c-format
 msgid "Could not sanitize path %s"
 msgstr ""
 
-#: lxc/snapshot.go:21
-msgid ""
-"Create a read-only snapshot of a container.\n"
-"\n"
-"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Creates a snapshot of the container (optionally with the container's memory\n"
-"state). When --stateful is used, LXD attempts to checkpoint the container's\n"
-"running state, including process memory state, TCP connections, etc. so that "
-"it\n"
-"can be restored (via lxc restore) at a later time (although some things, e."
-"g.\n"
-"TCP connections after the TCP timeout window has expired, may not be "
-"restored\n"
-"successfully).\n"
-"\n"
-"Example:\n"
-"    lxc snapshot u1 snap0"
-msgstr ""
-
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:67 lxc/file.go:68
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:317 lxc/info.go:95
+#: lxc/image.go:319 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:184 lxc/launch.go:139
+#: lxc/init.go:182 lxc/launch.go:137
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:182
+#: lxc/init.go:180
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:610 lxc/image.go:651
+#: lxc/image.go:612 lxc/image.go:653
 msgid "DESCRIPTION"
 msgstr ""
 
-#: lxc/storage.go:570
+#: lxc/storage.go:608
 msgid "DRIVER"
 msgstr ""
 
@@ -341,44 +298,33 @@ msgstr ""
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
-#: lxc/delete.go:26
-msgid ""
-"Delete containers or snapshots.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Destroy containers or snapshots with any attached data (configuration, "
-"snapshots, ...)."
-msgstr ""
-
-#: lxc/config.go:652
+#: lxc/config.go:688
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config.go:839
+#: lxc/config.go:875
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
 
-#: lxc/info.go:143
+#: lxc/info.go:145
 msgid "Disk usage:"
 msgstr ""
 
-#: lxc/list.go:554
+#: lxc/list.go:578
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config.go:276
+#: lxc/config.go:312
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/main.go:41
+#: lxc/main.go:44
 msgid "Enable debug mode"
 msgstr ""
 
-#: lxc/main.go:40
+#: lxc/main.go:43
 msgid "Enable verbose mode"
 msgstr ""
 
@@ -386,11 +332,11 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/help.go:69
+#: lxc/help.go:77
 msgid "Environment:"
 msgstr ""
 
-#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:141 lxc/init.go:142
+#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:139 lxc/init.go:140
 msgid "Ephemeral container"
 msgstr ""
 
@@ -398,127 +344,102 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/exec.go:46
-msgid ""
-"Execute the specified command in a container.\n"
-"\n"
-"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
-"env KEY=VALUE...] [--] <command line>\n"
-"\n"
-"Mode defaults to non-interactive, interactive mode is selected if both stdin "
-"AND stdout are terminals (stderr is ignored)."
-msgstr ""
-
-#: lxc/image.go:321
+#: lxc/image.go:323
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:323
+#: lxc/image.go:325
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:273 lxc/image.go:608 lxc/image.go:650
+#: lxc/config.go:309 lxc/image.go:610 lxc/image.go:652
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/list.go:104
-msgid "Fast mode (same as --columns=nsacPt"
+#: lxc/manpage.go:62
+#, c-format
+msgid "Failed to generate 'lxc.%s.1': %v"
+msgstr ""
+
+#: lxc/manpage.go:55
+#, c-format
+msgid "Failed to generate 'lxc.1': %v"
+msgstr ""
+
+#: lxc/list.go:128
+msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:312
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
-#: lxc/action.go:45 lxc/action.go:46
+#: lxc/action.go:46 lxc/action.go:47
 msgid "Force the container to shutdown"
 msgstr ""
 
-#: lxc/delete.go:35 lxc/delete.go:36
+#: lxc/delete.go:33 lxc/delete.go:34
 msgid "Force the removal of stopped containers"
 msgstr ""
 
-#: lxc/main.go:42
+#: lxc/main.go:45
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:135 lxc/list.go:103
+#: lxc/image.go:137 lxc/list.go:127
 msgid "Format"
 msgstr ""
 
-#: lxc/remote.go:65
+#: lxc/remote.go:79
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/help.go:25
-msgid ""
-"Help page for the LXD client.\n"
-"\n"
-"lxc help [--all]"
-msgstr ""
-
-#: lxc/list.go:404
+#: lxc/list.go:428
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:405
+#: lxc/list.go:429
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config.go:275
+#: lxc/config.go:311
 msgid "ISSUE DATE"
 msgstr ""
 
-#: lxc/main.go:136
+#: lxc/main.go:139
 msgid "If this is your first time using LXD, you should also run: lxd init"
 msgstr ""
 
-#: lxc/main.go:43
+#: lxc/main.go:46
 msgid "Ignore aliases when determining what command to run"
 msgstr ""
 
-#: lxc/action.go:49
+#: lxc/action.go:50
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:248
+#: lxc/image.go:250
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:393 lxc/image.go:405
+#: lxc/image.go:395 lxc/image.go:407
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:390
+#: lxc/image.go:392
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
 
-#: lxc/init.go:75
-msgid ""
-"Initialize a container from a particular image.\n"
-"\n"
-"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
-"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--"
-"storage|-s <pool>]\n"
-"\n"
-"Initializes a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc init ubuntu:16.04 u1"
-msgstr ""
-
-#: lxc/remote.go:135
+#: lxc/remote.go:149
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config.go:254
+#: lxc/config.go:290
 msgid "Invalid certificate"
 msgstr ""
 
@@ -526,627 +447,163 @@ msgstr ""
 msgid "Invalid configuration key"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:359
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/file.go:286
+#: lxc/file.go:293
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:73
+#: lxc/file.go:80
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:126
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:133
+#: lxc/image.go:135
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:408
+#: lxc/list.go:432
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/main.go:27
+#: lxc/main.go:30
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:326
+#: lxc/image.go:328
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:328
+#: lxc/image.go:330
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid ""
-"Launch a container from a particular image.\n"
-"\n"
-"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
-"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
-"<network>] [--storage|-s <pool>]\n"
-"\n"
-"Launches a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc launch ubuntu:16.04 u1"
+#: lxc/info.go:241
+msgid "Log:"
 msgstr ""
 
-#: lxc/info.go:25
-msgid ""
-"List information on LXD servers and containers.\n"
-"\n"
-"For a container:\n"
-"    lxc info [<remote:>]<container> [--show-log]\n"
-"\n"
-"For a server:\n"
-"    lxc info [<remote:>]"
+#: lxc/network.go:460
+msgid "MANAGED"
 msgstr ""
 
-#: lxc/list.go:47
-msgid ""
-"Lists the containers.\n"
-"\n"
-"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
-"fast]\n"
-"\n"
-"The filters are:\n"
-"* A single keyword like \"web\" which will list any container with a name "
-"starting by \"web\".\n"
-"* A regular expression on the container name. (e.g. .*web.*01$)\n"
-"* A key/value pair referring to a configuration item. For those, the "
-"namespace can be abbreviated to the smallest unambiguous identifier:\n"
-" * \"user.blah=abc\" will list all containers with the \"blah\" user "
-"property set to \"abc\".\n"
-" * \"u.blah=abc\" will do the same\n"
-" * \"security.privileged=1\" will list all privileged containers\n"
-" * \"s.privileged=1\" will do the same\n"
-"* A regular expression matching a configuration item or its value. (e.g. "
-"volatile.eth0.hwaddr=00:16:3e:.*)\n"
-"\n"
-"The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table format.\n"
-"Column arguments are either pre-defined shorthand chars (see below),\n"
-"or (extended) config keys.  Commas between consecutive shorthand chars\n"
-"are optional.\n"
-"\n"
-"Pre-defined shorthand chars:\n"
-"* 4 - IPv4 address\n"
-"* 6 - IPv6 address\n"
-"* a - architecture\n"
-"* b - storage pool\n"
-"* c - creation date\n"
-"* l - last used date\n"
-"* n - name\n"
-"* p - pid of container init process\n"
-"* P - profiles\n"
-"* s - state\n"
-"* S - number of snapshots\n"
-"* t - type (persistent or ephemeral)\n"
-"\n"
-"Config key syntax: key[:name][:maxWidth]\n"
-"* key      - The (extended) config key to display\n"
-"* name     - Name to display in the column header, defaults to the key\n"
-"             if not specified or if empty (to allow defining maxWidth\n"
-"             without a custom name, e.g. user.key::0)\n"
-"* maxWidth - Max width of the column (longer results are truncated).\n"
-"             -1 == unlimited\n"
-"              0 == width of column header\n"
-"             >0 == max width in chars\n"
-"             Default is -1 (unlimited)\n"
-"\n"
-"Default column layout: ns46tS\n"
-"Fast column layout: nsacPt\n"
-"\n"
-"Example:\n"
-"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
-"hwaddr:MAC"
+#: lxc/image.go:133
+msgid "Make image public"
 msgstr ""
 
-#: lxc/info.go:239
-msgid "Log:"
+#: lxc/publish.go:34
+msgid "Make the image public"
 msgstr ""
 
-#: lxc/network.go:436
-msgid "MANAGED"
+#: lxc/info.go:163
+msgid "Memory (current)"
 msgstr ""
 
-#: lxc/image.go:131
-msgid "Make image public"
+#: lxc/info.go:167
+msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/publish.go:34
-msgid "Make the image public"
+#: lxc/info.go:179
+msgid "Memory usage:"
 msgstr ""
 
-#: lxc/profile.go:49
-msgid ""
-"Manage configuration profiles.\n"
-"\n"
-"lxc profile list [<remote>:]                                    List "
-"available profiles.\n"
-"lxc profile show [<remote>:]<profile>                           Show details "
-"of a profile.\n"
-"lxc profile create [<remote>:]<profile>                         Create a "
-"profile.\n"
-"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>      Copy the "
-"profile.\n"
-"lxc profile get [<remote>:]<profile> <key>                      Get profile "
-"configuration.\n"
-"lxc profile set [<remote>:]<profile> <key> <value>              Set profile "
-"configuration.\n"
-"lxc profile unset [<remote>:]<profile> <key>                    Unset "
-"profile configuration.\n"
-"lxc profile delete [<remote>:]<profile>                         Delete a "
-"profile.\n"
-"lxc profile edit [<remote>:]<profile>\n"
-"    Edit profile, either by launching external editor or reading STDIN.\n"
-"    Example: lxc profile edit <profile> # launch editor\n"
-"             cat profile.yaml | lxc profile edit <profile> # read from "
-"profile.yaml\n"
-"\n"
-"lxc profile assign [<remote>:]<container> <profiles>\n"
-"    Assign a comma-separated list of profiles to a container, in order.\n"
-"    All profiles passed in this call (and only those) will be applied\n"
-"    to the specified container, i.e. it sets the list of profiles exactly "
-"to\n"
-"    those specified in this command. To add/remove a particular profile from "
-"a\n"
-"    container, use {add|remove} below.\n"
-"    Example: lxc profile assign foo default,bar # Apply default and bar\n"
-"             lxc profile assign foo default # Only default is active\n"
-"             lxc profile assign '' # no profiles are applied anymore\n"
-"             lxc profile assign bar,default # Apply default second now\n"
-"lxc profile add [<remote>:]<container> <profile> # add a profile to a "
-"container\n"
-"lxc profile remove [<remote>:]<container> <profile> # remove the profile "
-"from a container\n"
-"\n"
-"Devices:\n"
-"lxc profile device list [<remote>:]<profile>                                "
-"List devices in the given profile.\n"
-"lxc profile device show [<remote>:]<profile>                                "
-"Show full device details in the given profile.\n"
-"lxc profile device remove [<remote>:]<profile> <name>                       "
-"Remove a device from a profile.\n"
-"lxc profile device get [<remote>:]<profile> <name> <key>                    "
-"Get a device property.\n"
-"lxc profile device set [<remote>:]<profile> <name> <key> <value>            "
-"Set a device property.\n"
-"lxc profile device unset [<remote>:]<profile> <name> <key>                  "
-"Unset a device property.\n"
-"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
-"    Add a profile device, such as a disk or a nic, to the containers using "
-"the specified profile."
+#: lxc/utils.go:173
+msgid "Missing summary."
 msgstr ""
 
-#: lxc/config.go:58
-msgid ""
-"Manage configuration.\n"
-"\n"
-"lxc config device add [<remote>:]<container> <device> <type> "
-"[key=value...]   Add a device to a container.\n"
-"lxc config device get [<remote>:]<container> <device> "
-"<key>                   Get a device property.\n"
-"lxc config device set [<remote>:]<container> <device> <key> "
-"<value>           Set a device property.\n"
-"lxc config device unset [<remote>:]<container> <device> "
-"<key>                 Unset a device property.\n"
-"lxc config device list "
-"[<remote>:]<container>                                 List devices for "
-"container.\n"
-"lxc config device show "
-"[<remote>:]<container>                                 Show full device "
-"details for container.\n"
-"lxc config device remove [<remote>:]<container> "
-"<name>                        Remove device from container.\n"
-"\n"
-"lxc config get [<remote>:][container] "
-"<key>                                   Get container or server "
-"configuration key.\n"
-"lxc config set [<remote>:][container] <key> "
-"<value>                           Set container or server configuration "
-"key.\n"
-"lxc config unset [<remote>:][container] "
-"<key>                                 Unset container or server "
-"configuration key.\n"
-"lxc config show [<remote>:][container] [--"
-"expanded]                           Show container or server configuration.\n"
-"lxc config edit [<remote>:]"
-"[container]                                        Edit container or server "
-"configuration in external editor.\n"
-"    Edit configuration, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc config edit <container> # launch editor\n"
-"             cat config.yaml | lxc config edit <container> # read from "
-"config.yaml\n"
-"\n"
-"lxc config trust list "
-"[<remote>:]                                             List all trusted "
-"certs.\n"
-"lxc config trust add [<remote>:] <certfile."
-"crt>                               Add certfile.crt to trusted hosts.\n"
-"lxc config trust remove [<remote>:] [hostname|"
-"fingerprint]                    Remove the cert from trusted hosts.\n"
-"\n"
-"Examples:\n"
-"To mount host's /share/c1 onto /opt in the container:\n"
-"    lxc config device add [<remote>:]container1 <device-name> disk source=/"
-"share/c1 path=opt\n"
-"\n"
-"To set an lxc config value:\n"
-"    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = "
-"1'\n"
-"\n"
-"To listen on IPv4 and IPv6 port 8443 (you can omit the 8443 its the "
-"default):\n"
-"    lxc config set core.https_address [::]:8443\n"
-"\n"
-"To set the server trust password:\n"
-"    lxc config set core.trust_password blah"
+#: lxc/network.go:248 lxc/network.go:297 lxc/storage.go:362 lxc/storage.go:462
+msgid "More than one device matches, specify the device name."
 msgstr ""
 
-#: lxc/file.go:36
-msgid ""
-"Manage files in a container.\n"
-"\n"
-"lxc file pull [-r|--recursive] [<remote>:]<container> "
-"[[<remote>:]<container>...] <target path>\n"
-"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
-"mode=MODE] <source path> [<source path>...] [<remote>:]<container>\n"
-"lxc file delete [<remote>:]<container> [[<remote>:]<container>...]\n"
-"lxc file edit [<remote>:]<container>/<path>\n"
-"\n"
-"<source> in the case of pull, <target> in the case of push and <file> in the "
-"case of edit are <container name>/<path>\n"
-"\n"
-"Examples:\n"
-"To push /etc/hosts into the container foo:\n"
-"    lxc file push /etc/hosts foo/etc/hosts\n"
-"\n"
-"To pull /etc/hosts from the container:\n"
-"    lxc file pull foo/etc/hosts ."
+#: lxc/file.go:281
+msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/network.go:49
-msgid ""
-"Manage networks.\n"
-"\n"
-"lxc network list [<remote>:]                              List available "
-"networks.\n"
-"lxc network show [<remote>:]<network>                     Show details of a "
-"network.\n"
-"lxc network create [<remote>:]<network> [key=value...]    Create a network.\n"
-"lxc network get [<remote>:]<network> <key>                Get network "
-"configuration.\n"
-"lxc network set [<remote>:]<network> <key> <value>        Set network "
-"configuration.\n"
-"lxc network unset [<remote>:]<network> <key>              Unset network "
-"configuration.\n"
-"lxc network delete [<remote>:]<network>                   Delete a network.\n"
-"lxc network edit [<remote>:]<network>\n"
-"    Edit network, either by launching external editor or reading STDIN.\n"
-"    Example: lxc network edit <network> # launch editor\n"
-"             cat network.yaml | lxc network edit <network> # read from "
-"network.yaml\n"
-"\n"
-"lxc network attach [<remote>:]<network> <container> [device name] [interface "
-"name]\n"
-"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
-"[interface name]\n"
-"\n"
-"lxc network detach [<remote>:]<network> <container> [device name]\n"
-"lxc network detach-profile [<remote>:]<network> <container> [device name]"
+#: lxc/action.go:68
+msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/remote.go:37
-msgid ""
-"Manage remote LXD servers.\n"
-"\n"
-"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
-"password=PASSWORD]\n"
-"                                        [--public] [--protocol=PROTOCOL]    "
-"Add the remote <remote> at <url>.\n"
-"lxc remote remove <remote>                                                  "
-"Remove the remote <remote>.\n"
-"lxc remote list                                                             "
-"List all remotes.\n"
-"lxc remote rename <old name> <new name>                                     "
-"Rename remote <old name> to <new name>.\n"
-"lxc remote set-url <remote> <url>                                           "
-"Update <remote>'s url to <url>.\n"
-"lxc remote set-default <remote>                                             "
-"Set the default remote.\n"
-"lxc remote get-default                                                      "
-"Print the default remote."
+#: lxc/list.go:433 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:394
+#: lxc/storage.go:607 lxc/storage.go:687
+msgid "NAME"
 msgstr ""
 
-#: lxc/storage.go:61
-msgid ""
-"Manage storage.\n"
-"\n"
-"lxc storage list [<remote>:]                                    List "
-"available storage pools.\n"
-"lxc storage show [<remote>:]<pool>                              Show details "
-"of a storage pool.\n"
-"lxc storage create [<remote>:]<pool> <driver> [key=value]...    Create a "
-"storage pool.\n"
-"lxc storage get [<remote>:]<pool> <key>                         Get storage "
-"pool configuration.\n"
-"lxc storage set [<remote>:]<pool> <key> <value>                 Set storage "
-"pool configuration.\n"
-"lxc storage unset [<remote>:]<pool> <key>                       Unset "
-"storage pool configuration.\n"
-"lxc storage delete [<remote>:]<pool>                            Delete a "
-"storage pool.\n"
-"lxc storage edit [<remote>:]<pool>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage edit [<remote>:]<pool> # launch editor\n"
-"             cat pool.yaml | lxc storage edit [<remote>:]<pool> # read from "
-"pool.yaml\n"
-"\n"
-"lxc storage volume list [<remote>:]<pool>                              List "
-"available storage volumes on a storage pool.\n"
-"lxc storage volume show [<remote>:]<pool> <volume>                     Show "
-"details of a storage volume on a storage pool.\n"
-"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...    "
-"Create a storage volume on a storage pool.\n"
-"lxc storage volume get [<remote>:]<pool> <volume> <key>                Get "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>        Set "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume unset [<remote>:]<pool> <volume> <key>              Unset "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume delete [<remote>:]<pool> <volume>                   "
-"Delete a storage volume on a storage pool.\n"
-"lxc storage volume edit [<remote>:]<pool> <volume>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage volume edit [<remote>:]<pool> <volume> # launch "
-"editor\n"
-"             cat pool.yaml | lxc storage volume edit [<remote>:]<pool> "
-"<volume> # read from pool.yaml\n"
-"\n"
-"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
-"name] <path>\n"
-"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name] <path>\n"
-"\n"
-"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
-"name]\n"
-"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name]\n"
-"\n"
-"\n"
-"Unless specified through a prefix, all volume operations affect \"custom"
-"\" (user created) volumes.\n"
-"\n"
-"Examples:\n"
-"To show the properties of a custom volume called \"data\" in the \"default\" "
-"pool:\n"
-"    lxc storage volume show default data\n"
-"\n"
-"To show the properties of the filesystem for a container called \"data\" in "
-"the \"default\" pool:\n"
-"    lxc storage volume show default container/data\n"
+#: lxc/network.go:444 lxc/remote.go:368 lxc/remote.go:373
+msgid "NO"
 msgstr ""
 
-#: lxc/image.go:62
-msgid ""
-"Manipulate container images.\n"
-"\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
-"server.\n"
-"\n"
-"When using remote images, LXD will automatically cache images for you\n"
-"and remove them upon expiration.\n"
-"\n"
-"The image unique identifier is the hash (sha-256) of its representation\n"
-"as a compressed tarball (or for split images, the concatenation of the\n"
-"metadata and rootfs tarballs).\n"
-"\n"
-"Images can be referenced by their full hash, shortest unique partial\n"
-"hash or alias name (if one is set).\n"
-"\n"
-"\n"
-"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
-"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
-"[--alias=ALIAS...] [prop=value]\n"
-"    Import an image tarball (or tarballs) into the LXD image store.\n"
-"\n"
-"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-"
-"aliases] [--public] [--auto-update]\n"
-"    Copy an image from one LXD daemon to another over the network.\n"
-"\n"
-"    The auto-update flag instructs the server to keep this image up to\n"
-"    date. It requires the source to be an alias and for it to be public.\n"
-"\n"
-"lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
-"    Delete one or more images from the LXD image store.\n"
-"\n"
-"lxc image export [<remote>:]<image> [target]\n"
-"    Export an image from the LXD image store into a distributable tarball.\n"
-"\n"
-"    The output target is optional and defaults to the working directory.\n"
-"    The target may be an existing directory, file name, or \"-\" to specify\n"
-"    stdout.  The target MUST be a directory when exporting a split image.\n"
-"    If the target is a directory, the image's name (each part's name for\n"
-"    split images) as found in the database will be used for the exported\n"
-"    image.  If the target is a file (not a directory and not stdout), then\n"
-"    the appropriate extension will be appended to the provided file name\n"
-"    based on the algorithm used to compress the image. \n"
-"\n"
-"lxc image info [<remote>:]<image>\n"
-"    Print everything LXD knows about a given image.\n"
-"\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
-"    List images in the LXD image store. Filters may be of the\n"
-"    <key>=<value> form for property based filtering, or part of the image\n"
-"    hash or part of the image alias name.\n"
-"\n"
-"lxc image show [<remote>:]<image>\n"
-"    Yaml output of the user modifiable properties of an image.\n"
-"\n"
-"lxc image edit [<remote>:]<image>\n"
-"    Edit image, either by launching external editor or reading STDIN.\n"
-"    Example: lxc image edit <image> # launch editor\n"
-"             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
-"\n"
-"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
-"    Create a new alias for an existing image.\n"
-"\n"
-"lxc image alias delete [<remote>:]<alias>\n"
-"    Delete an alias.\n"
-"\n"
-"lxc image alias list [<remote>:] [filter]\n"
-"    List the aliases. Filters may be part of the image hash or part of the "
-"image alias name."
-msgstr ""
-
-#: lxc/info.go:161
-msgid "Memory (current)"
-msgstr ""
-
-#: lxc/info.go:165
-msgid "Memory (peak)"
-msgstr ""
-
-#: lxc/info.go:177
-msgid "Memory usage:"
-msgstr ""
-
-#: lxc/help.go:87
-msgid "Missing summary."
-msgstr ""
-
-#: lxc/monitor.go:41
-msgid ""
-"Monitor activity on the LXD server.\n"
-"\n"
-"lxc monitor [<remote>:] [--type=TYPE...]\n"
-"\n"
-"Connects to the monitoring interface of the specified LXD server.\n"
-"\n"
-"By default will listen to all message types.\n"
-"Specific types to listen to can be specified with --type.\n"
-"\n"
-"Example:\n"
-"    lxc monitor --type=logging"
-msgstr ""
-
-#: lxc/network.go:224 lxc/network.go:273 lxc/storage.go:324 lxc/storage.go:424
-msgid "More than one device matches, specify the device name."
-msgstr ""
-
-#: lxc/file.go:274
-msgid "More than one file to download, but target is not a directory"
-msgstr ""
-
-#: lxc/move.go:16
-msgid ""
-"Move containers within or in between lxd instances.\n"
-"\n"
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
-"    Move a container between two hosts, renaming it if destination name "
-"differs.\n"
-"\n"
-"lxc move <old name> <new name>\n"
-"    Rename a local container.\n"
-"\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
-"    Rename a snapshot."
-msgstr ""
-
-#: lxc/action.go:67
-msgid "Must supply container name for: "
-msgstr ""
-
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
-#: lxc/storage.go:569 lxc/storage.go:649
-msgid "NAME"
-msgstr ""
-
-#: lxc/network.go:420 lxc/remote.go:354 lxc/remote.go:359
-msgid "NO"
-msgstr ""
-
-#: lxc/info.go:89
+#: lxc/info.go:91
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/network.go:198
+#: lxc/network.go:222
 #, c-format
 msgid "Network %s created"
 msgstr ""
 
-#: lxc/network.go:301
+#: lxc/network.go:325
 #, c-format
 msgid "Network %s deleted"
 msgstr ""
 
-#: lxc/init.go:143 lxc/init.go:144
+#: lxc/init.go:141 lxc/init.go:142
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:196
 msgid "Network usage:"
 msgstr ""
 
-#: lxc/image.go:134 lxc/publish.go:35
+#: lxc/image.go:136 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/config.go:285
+#: lxc/config.go:321
 msgid "No certificate provided to add"
 msgstr ""
 
-#: lxc/network.go:233 lxc/network.go:282
+#: lxc/network.go:257 lxc/network.go:306
 msgid "No device found for this network"
 msgstr ""
 
-#: lxc/storage.go:333 lxc/storage.go:433
+#: lxc/storage.go:371 lxc/storage.go:471
 msgid "No device found for this storage volume."
 msgstr ""
 
-#: lxc/config.go:308
+#: lxc/config.go:344
 msgid "No fingerprint specified."
 msgstr ""
 
-#: lxc/storage.go:285 lxc/storage.go:369
+#: lxc/storage.go:323 lxc/storage.go:407
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:120
+#: lxc/remote.go:134
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:396
+#: lxc/image.go:398
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
-#: lxc/network.go:330 lxc/network.go:457
+#: lxc/network.go:354 lxc/network.go:481
 msgid "Only managed networks can be modified."
 msgstr ""
 
-#: lxc/help.go:63 lxc/main.go:112
+#: lxc/help.go:71 lxc/main.go:112 lxc/main.go:163
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:507
+#: lxc/image.go:509
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -1155,247 +612,219 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:556
+#: lxc/list.go:580
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:410
+#: lxc/list.go:434
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:411
+#: lxc/list.go:435
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:382
+#: lxc/remote.go:396
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:609 lxc/remote.go:383
+#: lxc/image.go:611 lxc/remote.go:397
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:188
+#: lxc/info.go:190
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:189
+#: lxc/info.go:191
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/help.go:70
+#: lxc/help.go:78
 msgid "Path to an alternate client configuration directory"
 msgstr ""
 
-#: lxc/help.go:71
+#: lxc/help.go:79
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:31
+#: lxc/main.go:202
+msgid "Pause containers."
+msgstr ""
+
+#: lxc/main.go:34
 msgid "Permission denied, are you in the lxd group?"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:108
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/network.go:355 lxc/profile.go:219 lxc/storage.go:498 lxc/storage.go:803
+#: lxc/network.go:379 lxc/profile.go:258 lxc/storage.go:536 lxc/storage.go:841
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:536 lxc/config.go:601 lxc/image.go:704
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:706
 msgid "Press enter to start the editor again"
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "Print all the subcommands help."
-msgstr ""
-
-#: lxc/help.go:65
+#: lxc/help.go:73
 msgid "Print debug information"
 msgstr ""
 
-#: lxc/help.go:64
+#: lxc/help.go:72
 msgid "Print less common commands"
 msgstr ""
 
-#: lxc/help.go:66
+#: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
 
-#: lxc/version.go:18
-msgid ""
-"Prints the version number of this client tool.\n"
-"\n"
-"lxc version"
-msgstr ""
-
-#: lxc/info.go:130
+#: lxc/info.go:132
 #, c-format
 msgid "Processes: %d"
 msgstr ""
 
-#: lxc/profile.go:275
+#: lxc/profile.go:314
 #, c-format
 msgid "Profile %s added to %s"
 msgstr ""
 
-#: lxc/profile.go:170
+#: lxc/profile.go:209
 #, c-format
 msgid "Profile %s created"
 msgstr ""
 
-#: lxc/profile.go:240
+#: lxc/profile.go:279
 #, c-format
 msgid "Profile %s deleted"
 msgstr ""
 
-#: lxc/profile.go:306
+#: lxc/profile.go:345
 #, c-format
 msgid "Profile %s removed from %s"
 msgstr ""
 
-#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:139 lxc/init.go:140
+#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:137 lxc/init.go:138
 msgid "Profile to apply to the new container"
 msgstr ""
 
-#: lxc/profile.go:256
+#: lxc/profile.go:295
 #, c-format
 msgid "Profiles %s applied to %s"
 msgstr ""
 
-#: lxc/info.go:104
+#: lxc/info.go:106
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:330
+#: lxc/image.go:332
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:54
+#: lxc/remote.go:68
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:313
+#: lxc/image.go:315
 #, c-format
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:27
-msgid ""
-"Publish containers as images.\n"
-"\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
-msgstr ""
-
-#: lxc/file.go:58 lxc/file.go:59
+#: lxc/file.go:65 lxc/file.go:66
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/remote.go:52
+#: lxc/remote.go:66
 msgid "Remote admin password"
 msgstr ""
 
-#: lxc/info.go:91
+#: lxc/info.go:93
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/delete.go:43
+#: lxc/delete.go:41
 #, c-format
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/delete.go:37 lxc/delete.go:38
+#: lxc/delete.go:35 lxc/delete.go:36
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:129
 msgid "Resources:"
 msgstr ""
 
-#: lxc/restore.go:21
-msgid ""
-"Restore a container's state to a previous snapshot.\n"
-"\n"
-"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
-"\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
-"\n"
-"Examples:\n"
-"Create the snapshot:\n"
-"    lxc snapshot u1 snap0\n"
-"\n"
-"Restore the snapshot:\n"
-"    lxc restore u1 snap0"
+#: lxc/main.go:210
+msgid "Restart containers."
 msgstr ""
 
-#: lxc/init.go:256
+#: lxc/init.go:254
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:612
+#: lxc/image.go:614
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:412
+#: lxc/list.go:436
 msgid "SNAPSHOTS"
 msgstr ""
 
-#: lxc/storage.go:571
+#: lxc/storage.go:609
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:413
+#: lxc/list.go:437
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:384
+#: lxc/remote.go:398
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:415
+#: lxc/list.go:439
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:225
+#: lxc/remote.go:239
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:287
+#: lxc/remote.go:301
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:53
+#: lxc/remote.go:67
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
-#: lxc/file.go:56
+#: lxc/file.go:63
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:57
+#: lxc/file.go:64
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:55
+#: lxc/file.go:62
 msgid "Set the file's uid on push"
 msgstr ""
 
-#: lxc/help.go:32
+#: lxc/help.go:29
 msgid "Show all commands (not just interesting ones)"
 msgstr ""
 
-#: lxc/help.go:67
+#: lxc/help.go:75
 msgid "Show client version"
 msgstr ""
 
-#: lxc/info.go:36
+#: lxc/info.go:38
 msgid "Show the container's last 100 log lines?"
 msgstr ""
 
@@ -1403,83 +832,91 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:311
+#: lxc/image.go:313
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:208
+#: lxc/info.go:210
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/action.go:133
+#: lxc/action.go:134
 #, c-format
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:340
+#: lxc/image.go:342
 msgid "Source:"
 msgstr ""
 
-#: lxc/launch.go:148
+#: lxc/main.go:220
+msgid "Start containers."
+msgstr ""
+
+#: lxc/launch.go:146
 #, c-format
 msgid "Starting %s"
 msgstr ""
 
-#: lxc/info.go:98
+#: lxc/info.go:100
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
+#: lxc/main.go:226
+msgid "Stop containers."
+msgstr ""
+
 #: lxc/publish.go:36 lxc/publish.go:37
 msgid "Stop the container if currently running"
 msgstr ""
 
-#: lxc/delete.go:107 lxc/publish.go:114
+#: lxc/delete.go:105 lxc/publish.go:114
 msgid "Stopping container failed!"
 msgstr ""
 
-#: lxc/storage.go:398
+#: lxc/storage.go:436
 #, c-format
 msgid "Storage pool %s created"
 msgstr ""
 
-#: lxc/storage.go:448
+#: lxc/storage.go:486
 #, c-format
 msgid "Storage pool %s deleted"
 msgstr ""
 
-#: lxc/init.go:145 lxc/init.go:146
+#: lxc/init.go:143 lxc/init.go:144
 msgid "Storage pool name"
 msgstr ""
 
-#: lxc/storage.go:672
+#: lxc/storage.go:710
 #, c-format
 msgid "Storage volume %s created"
 msgstr ""
 
-#: lxc/storage.go:682
+#: lxc/storage.go:720
 #, c-format
 msgid "Storage volume %s deleted"
 msgstr ""
 
-#: lxc/action.go:48
+#: lxc/action.go:49
 msgid "Store the container state (only for stop)"
 msgstr ""
 
-#: lxc/info.go:169
+#: lxc/info.go:171
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:173
+#: lxc/info.go:175
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:414 lxc/network.go:435 lxc/storage.go:648
+#: lxc/list.go:438 lxc/network.go:459 lxc/storage.go:686
 msgid "TYPE"
 msgstr ""
 
-#: lxc/delete.go:93
+#: lxc/delete.go:91
 msgid "The container is currently running, stop it first or pass --force."
 msgstr ""
 
@@ -1489,29 +926,29 @@ msgid ""
 "restarted."
 msgstr ""
 
-#: lxc/init.go:329
+#: lxc/init.go:327
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
-#: lxc/config.go:680 lxc/config.go:692 lxc/config.go:725 lxc/config.go:743
-#: lxc/config.go:781 lxc/config.go:799
+#: lxc/config.go:716 lxc/config.go:728 lxc/config.go:761 lxc/config.go:779
+#: lxc/config.go:817 lxc/config.go:835
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:313
+#: lxc/init.go:311
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/main.go:181
-msgid "The opposite of `lxc pause` is `lxc start`."
+#: lxc/action.go:34
+msgid "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/network.go:238 lxc/network.go:287 lxc/storage.go:338 lxc/storage.go:438
+#: lxc/network.go:262 lxc/network.go:311 lxc/storage.go:376 lxc/storage.go:476
 msgid "The specified device doesn't exist"
 msgstr ""
 
-#: lxc/network.go:242 lxc/network.go:291
+#: lxc/network.go:266 lxc/network.go:315
 msgid "The specified device doesn't match the network"
 msgstr ""
 
@@ -1519,201 +956,910 @@ msgstr ""
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
-#: lxc/action.go:44
+#: lxc/help.go:47
+msgid ""
+"This is the LXD command line client.\n"
+"\n"
+"All of LXD's features can be driven through the various commands below.\n"
+"For help with any of those, simply call them with --help."
+msgstr ""
+
+#: lxc/action.go:45
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:316
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:331
+#: lxc/init.go:329
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:330
+#: lxc/init.go:328
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
-#: lxc/main.go:137
+#: lxc/main.go:140
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:398
+#: lxc/image.go:400
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/action.go:97 lxc/launch.go:161
+#: lxc/action.go:98 lxc/launch.go:159
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:100
+#: lxc/info.go:102
 msgid "Type: ephemeral"
 msgstr ""
 
-#: lxc/info.go:102
+#: lxc/info.go:104
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:613
+#: lxc/image.go:615
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:381
+#: lxc/remote.go:395
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:461 lxc/profile.go:500 lxc/storage.go:610 lxc/storage.go:688
 msgid "USED BY"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/manpage.go:36
+msgid "Unable to find help2man."
+msgstr ""
+
+#: lxc/remote.go:109
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:319
+#: lxc/image.go:321
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/main.go:112
+#: lxc/action.go:37
 #, c-format
-msgid "Usage: %s"
+msgid ""
+"Usage: lxc %s [<remote>:]<container> [[<remote>:]<container>...]\n"
+"\n"
+"%s%s"
 msgstr ""
 
-#: lxc/help.go:48
+#: lxc/help.go:45
 msgid "Usage: lxc <command> [options]"
 msgstr ""
 
-#: lxc/delete.go:47
-msgid "User aborted delete operation."
-msgstr ""
-
-#: lxc/restore.go:38
+#: lxc/config.go:58
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
-"available)"
-msgstr ""
-
-#: lxc/snapshot.go:38
-msgid "Whether or not to snapshot the container's running state"
-msgstr ""
-
-#: lxc/network.go:422 lxc/remote.go:356 lxc/remote.go:361
-msgid "YES"
-msgstr ""
-
-#: lxc/main.go:52
-msgid "`lxc config profile` is deprecated, please use `lxc profile`"
-msgstr ""
-
-#: lxc/launch.go:132
-msgid "bad number of things scanned from image, container or snapshot"
-msgstr ""
-
-#: lxc/action.go:93
-msgid "bad result type from action"
-msgstr ""
-
-#: lxc/copy.go:116
-msgid "can't copy to the same container name"
-msgstr ""
-
-#: lxc/file.go:309
-msgid "can't pull a directory without --recursive"
-msgstr ""
-
-#: lxc/remote.go:344
-msgid "can't remove the default remote"
-msgstr ""
-
-#: lxc/file.go:120
-msgid "can't supply uid/gid/mode in recursive mode"
-msgstr ""
-
-#: lxc/remote.go:370
-msgid "default"
-msgstr ""
-
-#: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
-#: lxc/init.go:236 lxc/init.go:241 lxc/launch.go:116 lxc/launch.go:121
-msgid "didn't get any affected image, container or snapshot from server"
-msgstr ""
-
-#: lxc/image.go:305
-msgid "disabled"
-msgstr ""
-
-#: lxc/image.go:307
-msgid "enabled"
-msgstr ""
-
-#: lxc/action.go:125 lxc/main.go:22 lxc/main.go:148
-#, c-format
-msgid "error: %v"
-msgstr ""
-
-#: lxc/help.go:40 lxc/main.go:107
-#, c-format
-msgid "error: unknown command: %s"
-msgstr ""
-
-#: lxc/launch.go:136
-msgid "got bad version"
-msgstr ""
-
-#: lxc/image.go:300 lxc/image.go:589
-msgid "no"
-msgstr ""
-
-#: lxc/copy.go:165
-msgid "not all the profiles from the source exist on the target"
+"Usage: lxc config <subcommand> [options]\n"
+"\n"
+"Change container or server configuration options.\n"
+"\n"
+"*Container configuration*\n"
+"\n"
+"lxc config get [<remote>:][container] <key>\n"
+"    Get container or server configuration key.\n"
+"\n"
+"lxc config set [<remote>:][container] <key> <value>\n"
+"    Set container or server configuration key.\n"
+"\n"
+"lxc config unset [<remote>:][container] <key>\n"
+"    Unset container or server configuration key.\n"
+"\n"
+"lxc config show [<remote>:][container] [--expanded]\n"
+"    Show container or server configuration.\n"
+"\n"
+"lxc config edit [<remote>:][container]\n"
+"    Edit configuration, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Device management*\n"
+"\n"
+"lxc config device add [<remote>:]<container> <device> <type> [key=value...]\n"
+"    Add a device to a container.\n"
+"\n"
+"lxc config device get [<remote>:]<container> <device> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc config device set [<remote>:]<container> <device> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc config device unset [<remote>:]<container> <device> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc config device list [<remote>:]<container>\n"
+"    List devices for container.\n"
+"\n"
+"lxc config device show [<remote>:]<container>\n"
+"    Show full device details for container.\n"
+"\n"
+"lxc config device remove [<remote>:]<container> <name>\n"
+"    Remove device from container.\n"
+"\n"
+"*Client trust store management*\n"
+"\n"
+"lxc config trust list [<remote>:]\n"
+"    List all trusted certs.\n"
+"\n"
+"lxc config trust add [<remote>:] <certfile.crt>\n"
+"    Add certfile.crt to trusted hosts.\n"
+"\n"
+"lxc config trust remove [<remote>:] [hostname|fingerprint]\n"
+"    Remove the cert from trusted hosts.\n"
+"\n"
+"*Examples*\n"
+"\n"
+"cat config.yaml | lxc config edit <container>\n"
+"    Update the container configuration from config.yaml.\n"
+"\n"
+"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the container.\n"
+"\n"
+"lxc config set [<remote>:]<container> limits.cpu 2\n"
+"    Will set a CPU limit of \"2\" for the container.\n"
+"\n"
+"lxc config set core.https_address [::]:8443\n"
+"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"\n"
+"lxc config set core.trust_password blah\n"
+"    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/remote.go:218
-msgid "ok (y/n)?"
+#: lxc/copy.go:25
+msgid ""
+"Usage: lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] "
+"[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]\n"
+"\n"
+"Copy containers within or in between LXD instances."
 msgstr ""
 
-#: lxc/main.go:305 lxc/main.go:309
-#, c-format
-msgid "processing aliases failed %s\n"
+#: lxc/delete.go:26
+msgid ""
+"Usage: lxc delete [<remote>:]<container>[/<snapshot>] "
+"[[<remote>:]<container>[/<snapshot>]...]\n"
+"\n"
+"Delete containers and snapshots."
 msgstr ""
 
-#: lxc/file.go:376
-msgid "recursive edit doesn't make sense :("
+#: lxc/exec.go:46
+msgid ""
+"Usage: lxc exec [<remote>:]<container> [--mode=auto|interactive|non-"
+"interactive] [--env KEY=VALUE...] [--] <command line>\n"
+"\n"
+"Execute commands in containers.\n"
+"\n"
+"Mode defaults to non-interactive, interactive mode is selected if both stdin "
+"AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/remote.go:406
-#, c-format
-msgid "remote %s already exists"
+#: lxc/file.go:36
+msgid ""
+"Usage: lxc file <subcommand> [options]\n"
+"\n"
+"Manage files in containers.\n"
+"\n"
+"lxc file pull [-r|--recursive] [<remote>:]<container>/<path> "
+"[[<remote>:]<container>/<path>...] <target path>\n"
+"    Pull files from containers.\n"
+"\n"
+"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
+"mode=MODE] <source path> [<source path>...] [<remote>:]<container>/<path>\n"
+"    Push files into containers.\n"
+"\n"
+"lxc file delete [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"<path>...]\n"
+"    Delete files in containers.\n"
+"\n"
+"lxc file edit [<remote>:]<container>/<path>\n"
+"    Edit files in containers using the default text editor.\n"
+"\n"
+"*Examples*\n"
+"lxc file push /etc/hosts foo/etc/hosts\n"
+"   To push /etc/hosts into the container \"foo\".\n"
+"\n"
+"lxc file pull foo/etc/hosts .\n"
+"   To pull /etc/hosts from the container and write it to the current "
+"directory."
 msgstr ""
 
-#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
-#, c-format
-msgid "remote %s doesn't exist"
+#: lxc/finger.go:15
+msgid ""
+"Usage: lxc finger [<remote>:]\n"
+"\n"
+"Check if the LXD server is alive."
 msgstr ""
 
-#: lxc/remote.go:319
-#, c-format
-msgid "remote %s exists as <%s>"
+#: lxc/help.go:22
+msgid ""
+"Usage: lxc help [--all]\n"
+"\n"
+"Help page for the LXD client."
 msgstr ""
 
-#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
+#: lxc/image.go:62
+msgid ""
+"Usage: lxc image <subcommand> [options]\n"
+"\n"
+"Manipulate container images.\n"
+"\n"
+"In LXD containers are created from images. Those images were themselves\n"
+"either generated from an existing container or downloaded from an image\n"
+"server.\n"
+"\n"
+"When using remote images, LXD will automatically cache images for you\n"
+"and remove them upon expiration.\n"
+"\n"
+"The image unique identifier is the hash (sha-256) of its representation\n"
+"as a compressed tarball (or for split images, the concatenation of the\n"
+"metadata and rootfs tarballs).\n"
+"\n"
+"Images can be referenced by their full hash, shortest unique partial\n"
+"hash or alias name (if one is set).\n"
+"\n"
+"\n"
+"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
+"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
+"[--alias=ALIAS...] [prop=value]\n"
+"    Import an image tarball (or tarballs) into the LXD image store.\n"
+"\n"
+"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-"
+"aliases] [--public] [--auto-update]\n"
+"    Copy an image from one LXD daemon to another over the network.\n"
+"\n"
+"    The auto-update flag instructs the server to keep this image up to\n"
+"    date. It requires the source to be an alias and for it to be public.\n"
+"\n"
+"lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
+"    Delete one or more images from the LXD image store.\n"
+"\n"
+"lxc image export [<remote>:]<image> [target]\n"
+"    Export an image from the LXD image store into a distributable tarball.\n"
+"\n"
+"    The output target is optional and defaults to the working directory.\n"
+"    The target may be an existing directory, file name, or \"-\" to specify\n"
+"    stdout.  The target MUST be a directory when exporting a split image.\n"
+"    If the target is a directory, the image's name (each part's name for\n"
+"    split images) as found in the database will be used for the exported\n"
+"    image.  If the target is a file (not a directory and not stdout), then\n"
+"    the appropriate extension will be appended to the provided file name\n"
+"    based on the algorithm used to compress the image. \n"
+"\n"
+"lxc image info [<remote>:]<image>\n"
+"    Print everything LXD knows about a given image.\n"
+"\n"
+"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"    List images in the LXD image store. Filters may be of the\n"
+"    <key>=<value> form for property based filtering, or part of the image\n"
+"    hash or part of the image alias name.\n"
+"\n"
+"lxc image show [<remote>:]<image>\n"
+"    Yaml output of the user modifiable properties of an image.\n"
+"\n"
+"lxc image edit [<remote>:]<image>\n"
+"    Edit image, either by launching external editor or reading STDIN.\n"
+"    Example: lxc image edit <image> # launch editor\n"
+"             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
+"\n"
+"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
+"    Create a new alias for an existing image.\n"
+"\n"
+"lxc image alias delete [<remote>:]<alias>\n"
+"    Delete an alias.\n"
+"\n"
+"lxc image alias list [<remote>:] [filter]\n"
+"    List the aliases. Filters may be part of the image hash or part of the "
+"image alias name."
+msgstr ""
+
+#: lxc/info.go:25
+msgid ""
+"Usage: lxc info [<remote>:][<container>] [--show-log]\n"
+"\n"
+"Show container or server information.\n"
+"\n"
+"lxc info [<remote>:]<container> [--show-log]\n"
+"    For container information.\n"
+"\n"
+"lxc info [<remote>:]\n"
+"    For LXD server information."
+msgstr ""
+
+#: lxc/init.go:75
+msgid ""
+"Usage: lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc init ubuntu:16.04 u1"
+msgstr ""
+
+#: lxc/launch.go:23
+msgid ""
+"Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create and start containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc launch ubuntu:16.04 u1"
+msgstr ""
+
+#: lxc/list.go:47
+msgid ""
+"Usage: lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] "
+"[--fast]\n"
+"\n"
+"List the existing containers.\n"
+"\n"
+"Default column layout: ns46tS\n"
+"Fast column layout: nsacPt\n"
+"\n"
+"*Filters*\n"
+"A single keyword like \"web\" which will list any container with a name "
+"starting by \"web\".\n"
+"\n"
+"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"\n"
+"A key/value pair referring to a configuration item. For those, the namespace "
+"can be abbreviated to the smallest unambiguous identifier.\n"
+"    - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"property set to \"abc\".\n"
+"\n"
+"    - \"u.blah=abc\" will do the same\n"
+"\n"
+"    - \"security.privileged=1\" will list all privileged containers\n"
+"\n"
+"    - \"s.privileged=1\" will do the same\n"
+"\n"
+"A regular expression matching a configuration item or its value. (e.g. "
+"volatile.eth0.hwaddr=00:16:3e:.*).\n"
+"\n"
+"*Columns*\n"
+"The -c option takes a comma separated list of arguments that control\n"
+"which container attributes to output when displaying in table format.\n"
+"\n"
+"Column arguments are either pre-defined shorthand chars (see below),\n"
+"or (extended) config keys.\n"
+"\n"
+"Commas between consecutive shorthand chars are optional.\n"
+"\n"
+"Pre-defined column shorthand chars:\n"
+"\n"
+"    4 - IPv4 address\n"
+"\n"
+"    6 - IPv6 address\n"
+"\n"
+"    a - Architecture\n"
+"\n"
+"    b - Storage pool\n"
+"\n"
+"    c - Creation date\n"
+"\n"
+"    l - Last used date\n"
+"\n"
+"    n - Name\n"
+"\n"
+"    p - PID of the container's init process\n"
+"\n"
+"    P - Profiles\n"
+"\n"
+"    s - State\n"
+"\n"
+"    S - Number of snapshots\n"
+"\n"
+"    t - Type (persistent or ephemeral)\n"
+"\n"
+"Custom columns are defined with \"key[:name][:maxWidth]\":\n"
+"\n"
+"    KEY: The (extended) config key to display\n"
+"\n"
+"    NAME: Name to display in the column header.\n"
+"    Defaults to the key if not specified or empty.\n"
+"\n"
+"    MAXWIDTH: Max width of the column (longer results are truncated).\n"
+"    Defaults to -1 (unlimited). Use 0 to limit to the column header size.\n"
+"\n"
+"*Examples*\n"
+"lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:"
+"MAC\n"
+"    Shows a list of containers using the \"NAME\", \"BASE IMAGE\", \"STATE"
+"\", \"IPV4\",\n"
+"    \"IPV6\" and \"MAC\" columns.\n"
+"\n"
+"    \"BASE IMAGE\" and \"MAC\" are custom columns generated from container "
+"configuration keys."
+msgstr ""
+
+#: lxc/manpage.go:20
+msgid ""
+"Usage: lxc manpage <directory>\n"
+"\n"
+"Generate all the LXD manpages."
+msgstr ""
+
+#: lxc/monitor.go:41
+msgid ""
+"Usage: lxc monitor [<remote>:] [--type=TYPE...]\n"
+"\n"
+"Monitor a local or remote LXD server.\n"
+"\n"
+"By default the monitor will listen to all message types.\n"
+"\n"
+"Message types to listen for can be specified with --type.\n"
+"\n"
+"*Examples*\n"
+"lxc monitor --type=logging\n"
+"    Only show log message."
+msgstr ""
+
+#: lxc/move.go:16
+msgid ""
+"Usage: lxc move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]]\n"
+"\n"
+"Move containers within or in between LXD instances.\n"
+"\n"
+"lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
+"    Move a container between two hosts, renaming it if destination name "
+"differs.\n"
+"\n"
+"lxc move <old name> <new name>\n"
+"    Rename a local container.\n"
+"\n"
+"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"    Rename a snapshot."
+msgstr ""
+
+#: lxc/network.go:49
+msgid ""
+"Usage: lxc network <subcommand> [options]\n"
+"\n"
+"Manage and attach containers to networks.\n"
+"\n"
+"lxc network list [<remote>:]\n"
+"    List available networks.\n"
+"\n"
+"lxc network show [<remote>:]<network>\n"
+"    Show details of a network.\n"
+"\n"
+"lxc network create [<remote>:]<network> [key=value...]\n"
+"    Create a network.\n"
+"\n"
+"lxc network get [<remote>:]<network> <key>\n"
+"    Get network configuration.\n"
+"\n"
+"lxc network set [<remote>:]<network> <key> <value>\n"
+"    Set network configuration.\n"
+"\n"
+"lxc network unset [<remote>:]<network> <key>\n"
+"    Unset network configuration.\n"
+"\n"
+"lxc network delete [<remote>:]<network>\n"
+"    Delete a network.\n"
+"\n"
+"lxc network edit [<remote>:]<network>\n"
+"    Edit network, either by launching external editor or reading STDIN.\n"
+"\n"
+"lxc network attach [<remote>:]<network> <container> [device name] [interface "
+"name]\n"
+"    Attach a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
+"[interface name]\n"
+"    Attach a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"*Examples*\n"
+"cat network.yaml | lxc network edit <network>\n"
+"    Update a network using the content of network.yaml"
+msgstr ""
+
+#: lxc/profile.go:49
+msgid ""
+"Usage: lxc profile <subcommand> [options]\n"
+"\n"
+"Manage container configuration profiles.\n"
+"\n"
+"*Profile configuration*\n"
+"lxc profile list [<remote>:]\n"
+"    List available profiles.\n"
+"\n"
+"lxc profile show [<remote>:]<profile>\n"
+"    Show details of a profile.\n"
+"\n"
+"lxc profile create [<remote>:]<profile>\n"
+"    Create a profile.\n"
+"\n"
+"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
+"    Copy the profile.\n"
+"\n"
+"lxc profile get [<remote>:]<profile> <key>\n"
+"    Get profile configuration.\n"
+"\n"
+"lxc profile set [<remote>:]<profile> <key> <value>\n"
+"    Set profile configuration.\n"
+"\n"
+"lxc profile unset [<remote>:]<profile> <key>\n"
+"    Unset profile configuration.\n"
+"\n"
+"lxc profile delete [<remote>:]<profile>\n"
+"    Delete a profile.\n"
+"\n"
+"lxc profile edit [<remote>:]<profile>\n"
+"    Edit profile, either by launching external editor or reading STDIN.\n"
+"\n"
+"*Profile assignment*\n"
+"lxc profile assign [<remote>:]<container> <profiles>\n"
+"    Replace the current set of profiles for the container by the one "
+"provided.\n"
+"\n"
+"lxc profile add [<remote>:]<container> <profile>\n"
+"    Add a profile to a container\n"
+"\n"
+"lxc profile remove [<remote>:]<container> <profile>\n"
+"    Remove the profile from a container\n"
+"\n"
+"*Device management*\n"
+"lxc profile device list [<remote>:]<profile>\n"
+"    List devices in the given profile.\n"
+"\n"
+"lxc profile device show [<remote>:]<profile>\n"
+"    Show full device details in the given profile.\n"
+"\n"
+"lxc profile device remove [<remote>:]<profile> <name>\n"
+"    Remove a device from a profile.\n"
+"\n"
+"lxc profile device get [<remote>:]<profile> <name> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc profile device unset [<remote>:]<profile> <name> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
+"    Add a profile device, such as a disk or a nic, to the containers using "
+"the specified profile.\n"
+"\n"
+"*Examples*\n"
+"cat profile.yaml | lxc profile edit <profile>\n"
+"    Update a profile using the content of profile.yaml\n"
+"\n"
+"lxc profile assign foo default,bar\n"
+"    Set the profiles for \"foo\" to \"default\" and \"bar\".\n"
+"\n"
+"lxc profile assign foo default\n"
+"    Reset \"foo\" to only using the \"default\" profile.\n"
+"\n"
+"lxc profile assign foo ''\n"
+"    Remove all profile from \"foo\""
+msgstr ""
+
+#: lxc/publish.go:27
+msgid ""
+"Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]\n"
+"\n"
+"Publish containers as images."
+msgstr ""
+
+#: lxc/remote.go:37
+msgid ""
+"Usage: lxc remote <subcommand> [options]\n"
+"\n"
+"Manage the list of remote LXD servers.\n"
+"\n"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
+"password=PASSWORD] [--public] [--protocol=PROTOCOL]\n"
+"    Add the remote <remote> at <url>.\n"
+"\n"
+"lxc remote remove <remote>\n"
+"    Remove the remote <remote>.\n"
+"\n"
+"lxc remote list\n"
+"    List all remotes.\n"
+"\n"
+"lxc remote rename <old name> <new name>\n"
+"    Rename remote <old name> to <new name>.\n"
+"\n"
+"lxc remote set-url <remote> <url>\n"
+"    Update <remote>'s url to <url>.\n"
+"\n"
+"lxc remote set-default <remote>\n"
+"    Set the default remote.\n"
+"\n"
+"lxc remote get-default\n"
+"    Print the default remote."
+msgstr ""
+
+#: lxc/restore.go:21
+msgid ""
+"Usage: lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"\n"
+"Restore containers from snapshots.\n"
+"\n"
+"If --stateful is passed, then the running state will be restored too.\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create the snapshot.\n"
+"\n"
+"lxc restore u1 snap0\n"
+"    Restore the snapshot."
+msgstr ""
+
+#: lxc/snapshot.go:21
+msgid ""
+"Usage: lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"Create container snapshots.\n"
+"\n"
+"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"running state, including process memory state, TCP connections, ...\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create a snapshot of \"u1\" called \"snap0\"."
+msgstr ""
+
+#: lxc/storage.go:61
+msgid ""
+"Usage: lxc storage <subcommand> [options]\n"
+"\n"
+"Manage storage pools and volumes.\n"
+"\n"
+"*Storage pools*\n"
+"lxc storage list [<remote>:]\n"
+"    List available storage pools.\n"
+"\n"
+"lxc storage show [<remote>:]<pool>\n"
+"    Show details of a storage pool.\n"
+"\n"
+"lxc storage create [<remote>:]<pool> <driver> [key=value]...\n"
+"    Create a storage pool.\n"
+"\n"
+"lxc storage get [<remote>:]<pool> <key>\n"
+"    Get storage pool configuration.\n"
+"\n"
+"lxc storage set [<remote>:]<pool> <key> <value>\n"
+"    Set storage pool configuration.\n"
+"\n"
+"lxc storage unset [<remote>:]<pool> <key>\n"
+"    Unset storage pool configuration.\n"
+"\n"
+"lxc storage delete [<remote>:]<pool>\n"
+"    Delete a storage pool.\n"
+"\n"
+"lxc storage edit [<remote>:]<pool>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Storage volumes*\n"
+"lxc storage volume list [<remote>:]<pool>\n"
+"    List available storage volumes on a storage pool.\n"
+"\n"
+"lxc storage volume show [<remote>:]<pool> <volume>\n"
+"    Show details of a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...\n"
+"    Create a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume get [<remote>:]<pool> <volume> <key>\n"
+"    Get storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>\n"
+"    Set storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume unset [<remote>:]<pool> <volume> <key>\n"
+"    Unset storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume delete [<remote>:]<pool> <volume>\n"
+"    Delete a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
+"name] <path>\n"
+"    Attach a storage volume to the specified container.\n"
+"\n"
+"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name] <path>\n"
+"    Attach a storage volume to the specified profile.\n"
+"\n"
+"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
+"name]\n"
+"    Detach a storage volume from the specified container.\n"
+"\n"
+"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name]\n"
+"    Detach a storage volume from the specified profile.\n"
+"\n"
+"Unless specified through a prefix, all volume operations affect \"custom"
+"\" (user created) volumes.\n"
+"\n"
+"*Examples*\n"
+"cat pool.yaml | lxc storage edit [<remote>:]<pool>\n"
+"    Update a storage pool using the content of pool.yaml.\n"
+"\n"
+"cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Update a storage volume using the content of pool.yaml.\n"
+"\n"
+"lxc storage volume show default data\n"
+"    Will show the properties of a custom volume called \"data\" in the "
+"\"default\" pool.\n"
+"\n"
+"lxc storage volume show default container/data\n"
+"    Will show the properties of the filesystem for a container called \"data"
+"\" in the \"default\" pool."
+msgstr ""
+
+#: lxc/version.go:18
+msgid ""
+"Usage: lxc version\n"
+"\n"
+"Print the version number of this client tool."
+msgstr ""
+
+#: lxc/delete.go:45
+msgid "User aborted delete operation."
+msgstr ""
+
+#: lxc/restore.go:37
+msgid ""
+"Whether or not to restore the container's running state from snapshot (if "
+"available)"
+msgstr ""
+
+#: lxc/snapshot.go:35
+msgid "Whether or not to snapshot the container's running state"
+msgstr ""
+
+#: lxc/network.go:446 lxc/remote.go:370 lxc/remote.go:375
+msgid "YES"
+msgstr ""
+
+#: lxc/main.go:55
+msgid "`lxc config profile` is deprecated, please use `lxc profile`"
+msgstr ""
+
+#: lxc/launch.go:130
+msgid "bad number of things scanned from image, container or snapshot"
+msgstr ""
+
+#: lxc/action.go:94
+msgid "bad result type from action"
+msgstr ""
+
+#: lxc/copy.go:116
+msgid "can't copy to the same container name"
+msgstr ""
+
+#: lxc/file.go:316
+msgid "can't pull a directory without --recursive"
+msgstr ""
+
+#: lxc/remote.go:358
+msgid "can't remove the default remote"
+msgstr ""
+
+#: lxc/file.go:127
+msgid "can't supply uid/gid/mode in recursive mode"
+msgstr ""
+
+#: lxc/remote.go:384
+msgid "default"
+msgstr ""
+
+#: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
+#: lxc/init.go:234 lxc/init.go:239 lxc/launch.go:114 lxc/launch.go:119
+msgid "didn't get any affected image, container or snapshot from server"
+msgstr ""
+
+#: lxc/image.go:307
+msgid "disabled"
+msgstr ""
+
+#: lxc/image.go:309
+msgid "enabled"
+msgstr ""
+
+#: lxc/action.go:126 lxc/main.go:25 lxc/main.go:159
+#, c-format
+msgid "error: %v"
+msgstr ""
+
+#: lxc/help.go:37 lxc/main.go:106
+#, c-format
+msgid "error: unknown command: %s"
+msgstr ""
+
+#: lxc/launch.go:134
+msgid "got bad version"
+msgstr ""
+
+#: lxc/image.go:302 lxc/image.go:591
+msgid "no"
+msgstr ""
+
+#: lxc/copy.go:165
+msgid "not all the profiles from the source exist on the target"
+msgstr ""
+
+#: lxc/remote.go:232
+msgid "ok (y/n)?"
+msgstr ""
+
+#: lxc/main.go:331 lxc/main.go:335
+#, c-format
+msgid "processing aliases failed %s\n"
+msgstr ""
+
+#: lxc/file.go:383
+msgid "recursive edit doesn't make sense :("
+msgstr ""
+
+#: lxc/remote.go:420
+#, c-format
+msgid "remote %s already exists"
+msgstr ""
+
+#: lxc/remote.go:350 lxc/remote.go:412 lxc/remote.go:447 lxc/remote.go:463
+#, c-format
+msgid "remote %s doesn't exist"
+msgstr ""
+
+#: lxc/remote.go:333
+#, c-format
+msgid "remote %s exists as <%s>"
+msgstr ""
+
+#: lxc/remote.go:354 lxc/remote.go:416 lxc/remote.go:451
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/info.go:219
+#: lxc/info.go:221
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:221
+#: lxc/info.go:223
 msgid "stateless"
 msgstr ""
 
-#: lxc/info.go:215
+#: lxc/info.go:217
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -1722,11 +1868,11 @@ msgstr ""
 msgid "unreachable return reached"
 msgstr ""
 
-#: lxc/main.go:237
+#: lxc/main.go:262
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:302 lxc/image.go:593
+#: lxc/delete.go:44 lxc/image.go:304 lxc/image.go:595
 msgid "yes"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index df0db4d..c1a2e8e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-03-05 02:20-0500\n"
+"POT-Creation-Date: 2017-03-05 02:21-0500\n"
 "PO-Revision-Date: 2017-02-14 09:54+0000\n"
 "Last-Translator: Vyacheslav Razykov <v.razykov at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -190,142 +190,121 @@ msgstr ""
 "###\n"
 "### Обратите внимание, что имя отображается, но не может быть изменено"
 
-#: lxc/image.go:586
+#: lxc/image.go:588
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
 
-#: lxc/snapshot.go:61
+#: lxc/snapshot.go:58
 msgid "'/' not allowed in snapshot name"
 msgstr "Нельзя использовать '/' в имени снимка"
 
-#: lxc/profile.go:254
+#: lxc/profile.go:293
 msgid "(none)"
 msgstr "(пусто)"
 
-#: lxc/image.go:607 lxc/image.go:649
+#: lxc/image.go:609 lxc/image.go:651
 msgid "ALIAS"
 msgstr "ПСЕВДОНИМ"
 
-#: lxc/image.go:611
+#: lxc/image.go:613
 msgid "ARCH"
 msgstr "ARCH"
 
-#: lxc/list.go:406
+#: lxc/list.go:430
 msgid "ARCHITECTURE"
 msgstr "АРХИТЕКТУРА"
 
-#: lxc/remote.go:51
+#: lxc/remote.go:65
 msgid "Accept certificate"
 msgstr "Принять сертификат"
 
-#: lxc/remote.go:267
+#: lxc/remote.go:281
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Пароль администратора для %s: "
 
-#: lxc/image.go:334
+#: lxc/image.go:336
 msgid "Aliases:"
 msgstr "Псевдонимы:"
 
-#: lxc/image.go:312 lxc/info.go:93
+#: lxc/image.go:314 lxc/info.go:95
 #, c-format
 msgid "Architecture: %s"
 msgstr "Архитектура: %s"
 
-#: lxc/image.go:338
+#: lxc/image.go:340
 #, c-format
 msgid "Auto update: %s"
 msgstr "Авто-обновление: %s"
 
-#: lxc/help.go:49
-msgid "Available commands:"
-msgstr "Доступные команды:"
-
-#: lxc/info.go:186
+#: lxc/info.go:188
 msgid "Bytes received"
 msgstr ""
 
-#: lxc/info.go:187
+#: lxc/info.go:189
 msgid "Bytes sent"
 msgstr ""
 
-#: lxc/config.go:274
+#: lxc/config.go:310
 msgid "COMMON NAME"
 msgstr "ОБЩЕЕ ИМЯ"
 
-#: lxc/info.go:150
+#: lxc/info.go:152
 msgid "CPU usage (in seconds)"
 msgstr "Использование ЦП (в секундах)"
 
-#: lxc/info.go:154
+#: lxc/info.go:156
 #, fuzzy
 msgid "CPU usage:"
 msgstr " Использование ЦП:"
 
-#: lxc/list.go:407
+#: lxc/list.go:431
 msgid "CREATED AT"
 msgstr "СОЗДАН"
 
-#: lxc/config.go:114 lxc/network.go:471
+#: lxc/config.go:150 lxc/network.go:495
 #, c-format
 msgid "Can't read from stdin: %s"
 msgstr "Невозможно прочитать из стандартного ввода: %s"
 
-#: lxc/config.go:127 lxc/config.go:160 lxc/config.go:182
+#: lxc/config.go:163 lxc/config.go:196 lxc/config.go:218
 #, c-format
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:398 lxc/profile.go:433 lxc/storage.go:541
+#: lxc/network.go:422 lxc/profile.go:472 lxc/storage.go:579
 msgid "Cannot provide container name to list"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/remote.go:217
+#: lxc/remote.go:231
 #, c-format
 msgid "Certificate fingerprint: %x"
 msgstr ""
 
-#: lxc/action.go:36
-#, c-format
-msgid ""
-"Change state of one or more containers to %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-msgstr ""
-"Изменение состояния одного или нескольких контейнеров %s.\n"
-"\n"
-"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
-
-#: lxc/finger.go:15
-msgid ""
-"Check if the LXD instance is up.\n"
-"\n"
-"lxc finger [<remote>:]"
-msgstr ""
-"Проверьте, запущен ли экземпляр LXD.\n"
-"\n"
-"lxc finger [<remote>:]"
-
-#: lxc/remote.go:290
+#: lxc/remote.go:304
 msgid "Client certificate stored at server: "
 msgstr "Сертификат клиента хранится на сервере: "
 
-#: lxc/list.go:101 lxc/list.go:102
+#: lxc/list.go:125 lxc/list.go:126
 msgid "Columns"
 msgstr "Столбцы"
 
-#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:137 lxc/init.go:138
+#: lxc/help.go:53
+msgid "Commands:"
+msgstr ""
+
+#: lxc/copy.go:32 lxc/copy.go:33 lxc/init.go:135 lxc/init.go:136
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:535 lxc/config.go:600 lxc/image.go:703 lxc/network.go:354
-#: lxc/profile.go:218 lxc/storage.go:497 lxc/storage.go:802
+#: lxc/config.go:571 lxc/config.go:636 lxc/image.go:705 lxc/network.go:378
+#: lxc/profile.go:257 lxc/storage.go:535 lxc/storage.go:840
 #, c-format
 msgid "Config parsing error: %s"
 msgstr ""
 
-#: lxc/main.go:29
+#: lxc/main.go:32
 msgid "Connection refused; is LXD running?"
 msgstr "В соединении отказано; LXD запущен?"
 
@@ -333,7 +312,7 @@ msgstr "В соединении отказано; LXD запущен?"
 msgid "Container name is mandatory"
 msgstr "Имя контейнера является обязательным"
 
-#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:246
+#: lxc/copy.go:141 lxc/copy.go:242 lxc/init.go:244
 #, c-format
 msgid "Container name is: %s"
 msgstr "Имя контейнера: %s"
@@ -343,79 +322,47 @@ msgstr "Имя контейнера: %s"
 msgid "Container published with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:132
+#: lxc/image.go:134
 msgid "Copy aliases from source"
 msgstr "Копировать псевдонимы из источника"
 
-#: lxc/copy.go:25
-msgid ""
-"Copy containers within or in between LXD instances.\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
-"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-msgstr ""
-"Копирование контейнеров внутри или в между экземплярами LXD.\n"
-"\n"
-"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
-"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
-
-#: lxc/image.go:245
+#: lxc/image.go:247
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Копирование образа: %s"
 
-#: lxc/remote.go:232
+#: lxc/remote.go:246
 msgid "Could not create server cert dir"
 msgstr "Не удалось создать каталог сертификата сервера"
 
-#: lxc/file.go:84
+#: lxc/file.go:91
 #, c-format
 msgid "Could not sanitize path %s"
 msgstr "Не удалось очистить путь %s"
 
-#: lxc/snapshot.go:21
-msgid ""
-"Create a read-only snapshot of a container.\n"
-"\n"
-"lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Creates a snapshot of the container (optionally with the container's memory\n"
-"state). When --stateful is used, LXD attempts to checkpoint the container's\n"
-"running state, including process memory state, TCP connections, etc. so that "
-"it\n"
-"can be restored (via lxc restore) at a later time (although some things, e."
-"g.\n"
-"TCP connections after the TCP timeout window has expired, may not be "
-"restored\n"
-"successfully).\n"
-"\n"
-"Example:\n"
-"    lxc snapshot u1 snap0"
-msgstr ""
-
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:67 lxc/file.go:68
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:317 lxc/info.go:95
+#: lxc/image.go:319 lxc/info.go:97
 #, c-format
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:184 lxc/launch.go:139
+#: lxc/init.go:182 lxc/launch.go:137
 #, c-format
 msgid "Creating %s"
 msgstr ""
 
-#: lxc/init.go:182
+#: lxc/init.go:180
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:610 lxc/image.go:651
+#: lxc/image.go:612 lxc/image.go:653
 msgid "DESCRIPTION"
 msgstr ""
 
-#: lxc/storage.go:570
+#: lxc/storage.go:608
 msgid "DRIVER"
 msgstr ""
 
@@ -423,45 +370,34 @@ msgstr ""
 msgid "Define a compression algorithm: for image or none"
 msgstr ""
 
-#: lxc/delete.go:26
-msgid ""
-"Delete containers or snapshots.\n"
-"\n"
-"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
-"<snapshot>]...]\n"
-"\n"
-"Destroy containers or snapshots with any attached data (configuration, "
-"snapshots, ...)."
-msgstr ""
-
-#: lxc/config.go:652
+#: lxc/config.go:688
 #, c-format
 msgid "Device %s added to %s"
 msgstr ""
 
-#: lxc/config.go:839
+#: lxc/config.go:875
 #, c-format
 msgid "Device %s removed from %s"
 msgstr ""
 
-#: lxc/info.go:143
+#: lxc/info.go:145
 #, fuzzy
 msgid "Disk usage:"
 msgstr " Использование диска:"
 
-#: lxc/list.go:554
+#: lxc/list.go:578
 msgid "EPHEMERAL"
 msgstr ""
 
-#: lxc/config.go:276
+#: lxc/config.go:312
 msgid "EXPIRY DATE"
 msgstr ""
 
-#: lxc/main.go:41
+#: lxc/main.go:44
 msgid "Enable debug mode"
 msgstr ""
 
-#: lxc/main.go:40
+#: lxc/main.go:43
 msgid "Enable verbose mode"
 msgstr ""
 
@@ -469,11 +405,11 @@ msgstr ""
 msgid "Environment variable to set (e.g. HOME=/home/foo)"
 msgstr ""
 
-#: lxc/help.go:69
+#: lxc/help.go:77
 msgid "Environment:"
 msgstr ""
 
-#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:141 lxc/init.go:142
+#: lxc/copy.go:36 lxc/copy.go:37 lxc/init.go:139 lxc/init.go:140
 msgid "Ephemeral container"
 msgstr ""
 
@@ -481,127 +417,102 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/exec.go:46
-msgid ""
-"Execute the specified command in a container.\n"
-"\n"
-"lxc exec [<remote>:]<container> [--mode=auto|interactive|non-interactive] [--"
-"env KEY=VALUE...] [--] <command line>\n"
-"\n"
-"Mode defaults to non-interactive, interactive mode is selected if both stdin "
-"AND stdout are terminals (stderr is ignored)."
-msgstr ""
-
-#: lxc/image.go:321
+#: lxc/image.go:323
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:323
+#: lxc/image.go:325
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:273 lxc/image.go:608 lxc/image.go:650
+#: lxc/config.go:309 lxc/image.go:610 lxc/image.go:652
 msgid "FINGERPRINT"
 msgstr ""
 
-#: lxc/list.go:104
-msgid "Fast mode (same as --columns=nsacPt"
+#: lxc/manpage.go:62
+#, c-format
+msgid "Failed to generate 'lxc.%s.1': %v"
+msgstr ""
+
+#: lxc/manpage.go:55
+#, c-format
+msgid "Failed to generate 'lxc.1': %v"
+msgstr ""
+
+#: lxc/list.go:128
+msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:310
+#: lxc/image.go:312
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
-#: lxc/action.go:45 lxc/action.go:46
+#: lxc/action.go:46 lxc/action.go:47
 msgid "Force the container to shutdown"
 msgstr ""
 
-#: lxc/delete.go:35 lxc/delete.go:36
+#: lxc/delete.go:33 lxc/delete.go:34
 msgid "Force the removal of stopped containers"
 msgstr ""
 
-#: lxc/main.go:42
+#: lxc/main.go:45
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:135 lxc/list.go:103
+#: lxc/image.go:137 lxc/list.go:127
 msgid "Format"
 msgstr ""
 
-#: lxc/remote.go:65
+#: lxc/remote.go:79
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
-#: lxc/help.go:25
-msgid ""
-"Help page for the LXD client.\n"
-"\n"
-"lxc help [--all]"
-msgstr ""
-
-#: lxc/list.go:404
+#: lxc/list.go:428
 msgid "IPV4"
 msgstr ""
 
-#: lxc/list.go:405
+#: lxc/list.go:429
 msgid "IPV6"
 msgstr ""
 
-#: lxc/config.go:275
+#: lxc/config.go:311
 msgid "ISSUE DATE"
 msgstr ""
 
-#: lxc/main.go:136
+#: lxc/main.go:139
 msgid "If this is your first time using LXD, you should also run: lxd init"
 msgstr ""
 
-#: lxc/main.go:43
+#: lxc/main.go:46
 msgid "Ignore aliases when determining what command to run"
 msgstr ""
 
-#: lxc/action.go:49
+#: lxc/action.go:50
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:248
+#: lxc/image.go:250
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:393 lxc/image.go:405
+#: lxc/image.go:395 lxc/image.go:407
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:390
+#: lxc/image.go:392
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
 
-#: lxc/init.go:75
-msgid ""
-"Initialize a container from a particular image.\n"
-"\n"
-"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
-"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>] [--"
-"storage|-s <pool>]\n"
-"\n"
-"Initializes a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc init ubuntu:16.04 u1"
-msgstr ""
-
-#: lxc/remote.go:135
+#: lxc/remote.go:149
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
 
-#: lxc/config.go:254
+#: lxc/config.go:290
 msgid "Invalid certificate"
 msgstr ""
 
@@ -609,629 +520,165 @@ msgstr ""
 msgid "Invalid configuration key"
 msgstr ""
 
-#: lxc/file.go:352
+#: lxc/file.go:359
 #, c-format
 msgid "Invalid path %s"
 msgstr ""
 
-#: lxc/file.go:286
+#: lxc/file.go:293
 #, c-format
 msgid "Invalid source %s"
 msgstr ""
 
-#: lxc/file.go:73
+#: lxc/file.go:80
 #, c-format
 msgid "Invalid target %s"
 msgstr ""
 
-#: lxc/info.go:124
+#: lxc/info.go:126
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:133
+#: lxc/image.go:135
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
-#: lxc/list.go:408
+#: lxc/list.go:432
 msgid "LAST USED AT"
 msgstr ""
 
-#: lxc/main.go:27
+#: lxc/main.go:30
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:326
+#: lxc/image.go:328
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:328
+#: lxc/image.go:330
 msgid "Last used: never"
 msgstr ""
 
-#: lxc/launch.go:23
-msgid ""
-"Launch a container from a particular image.\n"
-"\n"
-"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
-"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
-"<network>] [--storage|-s <pool>]\n"
-"\n"
-"Launches a container using the specified image and name.\n"
-"\n"
-"Not specifying -p will result in the default profile.\n"
-"Specifying \"-p\" with no argument will result in no profile.\n"
-"\n"
-"Example:\n"
-"    lxc launch ubuntu:16.04 u1"
+#: lxc/info.go:241
+msgid "Log:"
 msgstr ""
 
-#: lxc/info.go:25
-msgid ""
-"List information on LXD servers and containers.\n"
-"\n"
-"For a container:\n"
-"    lxc info [<remote:>]<container> [--show-log]\n"
-"\n"
-"For a server:\n"
-"    lxc info [<remote:>]"
+#: lxc/network.go:460
+msgid "MANAGED"
 msgstr ""
 
-#: lxc/list.go:47
-msgid ""
-"Lists the containers.\n"
-"\n"
-"lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] [--"
-"fast]\n"
-"\n"
-"The filters are:\n"
-"* A single keyword like \"web\" which will list any container with a name "
-"starting by \"web\".\n"
-"* A regular expression on the container name. (e.g. .*web.*01$)\n"
-"* A key/value pair referring to a configuration item. For those, the "
-"namespace can be abbreviated to the smallest unambiguous identifier:\n"
-" * \"user.blah=abc\" will list all containers with the \"blah\" user "
-"property set to \"abc\".\n"
-" * \"u.blah=abc\" will do the same\n"
-" * \"security.privileged=1\" will list all privileged containers\n"
-" * \"s.privileged=1\" will do the same\n"
-"* A regular expression matching a configuration item or its value. (e.g. "
-"volatile.eth0.hwaddr=00:16:3e:.*)\n"
-"\n"
-"The -c option takes a comma separated list of arguments that control\n"
-"which container attributes to output when displaying in table format.\n"
-"Column arguments are either pre-defined shorthand chars (see below),\n"
-"or (extended) config keys.  Commas between consecutive shorthand chars\n"
-"are optional.\n"
-"\n"
-"Pre-defined shorthand chars:\n"
-"* 4 - IPv4 address\n"
-"* 6 - IPv6 address\n"
-"* a - architecture\n"
-"* b - storage pool\n"
-"* c - creation date\n"
-"* l - last used date\n"
-"* n - name\n"
-"* p - pid of container init process\n"
-"* P - profiles\n"
-"* s - state\n"
-"* S - number of snapshots\n"
-"* t - type (persistent or ephemeral)\n"
-"\n"
-"Config key syntax: key[:name][:maxWidth]\n"
-"* key      - The (extended) config key to display\n"
-"* name     - Name to display in the column header, defaults to the key\n"
-"             if not specified or if empty (to allow defining maxWidth\n"
-"             without a custom name, e.g. user.key::0)\n"
-"* maxWidth - Max width of the column (longer results are truncated).\n"
-"             -1 == unlimited\n"
-"              0 == width of column header\n"
-"             >0 == max width in chars\n"
-"             Default is -1 (unlimited)\n"
-"\n"
-"Default column layout: ns46tS\n"
-"Fast column layout: nsacPt\n"
-"\n"
-"Example:\n"
-"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
-"hwaddr:MAC"
+#: lxc/image.go:133
+msgid "Make image public"
 msgstr ""
 
-#: lxc/info.go:239
-msgid "Log:"
+#: lxc/publish.go:34
+msgid "Make the image public"
 msgstr ""
 
-#: lxc/network.go:436
-msgid "MANAGED"
+#: lxc/info.go:163
+msgid "Memory (current)"
 msgstr ""
 
-#: lxc/image.go:131
-msgid "Make image public"
+#: lxc/info.go:167
+msgid "Memory (peak)"
 msgstr ""
 
-#: lxc/publish.go:34
-msgid "Make the image public"
+#: lxc/info.go:179
+#, fuzzy
+msgid "Memory usage:"
+msgstr " Использование памяти:"
+
+#: lxc/utils.go:173
+msgid "Missing summary."
 msgstr ""
 
-#: lxc/profile.go:49
-msgid ""
-"Manage configuration profiles.\n"
-"\n"
-"lxc profile list [<remote>:]                                    List "
-"available profiles.\n"
-"lxc profile show [<remote>:]<profile>                           Show details "
-"of a profile.\n"
-"lxc profile create [<remote>:]<profile>                         Create a "
-"profile.\n"
-"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>      Copy the "
-"profile.\n"
-"lxc profile get [<remote>:]<profile> <key>                      Get profile "
-"configuration.\n"
-"lxc profile set [<remote>:]<profile> <key> <value>              Set profile "
-"configuration.\n"
-"lxc profile unset [<remote>:]<profile> <key>                    Unset "
-"profile configuration.\n"
-"lxc profile delete [<remote>:]<profile>                         Delete a "
-"profile.\n"
-"lxc profile edit [<remote>:]<profile>\n"
-"    Edit profile, either by launching external editor or reading STDIN.\n"
-"    Example: lxc profile edit <profile> # launch editor\n"
-"             cat profile.yaml | lxc profile edit <profile> # read from "
-"profile.yaml\n"
-"\n"
-"lxc profile assign [<remote>:]<container> <profiles>\n"
-"    Assign a comma-separated list of profiles to a container, in order.\n"
-"    All profiles passed in this call (and only those) will be applied\n"
-"    to the specified container, i.e. it sets the list of profiles exactly "
-"to\n"
-"    those specified in this command. To add/remove a particular profile from "
-"a\n"
-"    container, use {add|remove} below.\n"
-"    Example: lxc profile assign foo default,bar # Apply default and bar\n"
-"             lxc profile assign foo default # Only default is active\n"
-"             lxc profile assign '' # no profiles are applied anymore\n"
-"             lxc profile assign bar,default # Apply default second now\n"
-"lxc profile add [<remote>:]<container> <profile> # add a profile to a "
-"container\n"
-"lxc profile remove [<remote>:]<container> <profile> # remove the profile "
-"from a container\n"
-"\n"
-"Devices:\n"
-"lxc profile device list [<remote>:]<profile>                                "
-"List devices in the given profile.\n"
-"lxc profile device show [<remote>:]<profile>                                "
-"Show full device details in the given profile.\n"
-"lxc profile device remove [<remote>:]<profile> <name>                       "
-"Remove a device from a profile.\n"
-"lxc profile device get [<remote>:]<profile> <name> <key>                    "
-"Get a device property.\n"
-"lxc profile device set [<remote>:]<profile> <name> <key> <value>            "
-"Set a device property.\n"
-"lxc profile device unset [<remote>:]<profile> <name> <key>                  "
-"Unset a device property.\n"
-"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
-"    Add a profile device, such as a disk or a nic, to the containers using "
-"the specified profile."
+#: lxc/network.go:248 lxc/network.go:297 lxc/storage.go:362 lxc/storage.go:462
+msgid "More than one device matches, specify the device name."
 msgstr ""
 
-#: lxc/config.go:58
-msgid ""
-"Manage configuration.\n"
-"\n"
-"lxc config device add [<remote>:]<container> <device> <type> "
-"[key=value...]   Add a device to a container.\n"
-"lxc config device get [<remote>:]<container> <device> "
-"<key>                   Get a device property.\n"
-"lxc config device set [<remote>:]<container> <device> <key> "
-"<value>           Set a device property.\n"
-"lxc config device unset [<remote>:]<container> <device> "
-"<key>                 Unset a device property.\n"
-"lxc config device list "
-"[<remote>:]<container>                                 List devices for "
-"container.\n"
-"lxc config device show "
-"[<remote>:]<container>                                 Show full device "
-"details for container.\n"
-"lxc config device remove [<remote>:]<container> "
-"<name>                        Remove device from container.\n"
-"\n"
-"lxc config get [<remote>:][container] "
-"<key>                                   Get container or server "
-"configuration key.\n"
-"lxc config set [<remote>:][container] <key> "
-"<value>                           Set container or server configuration "
-"key.\n"
-"lxc config unset [<remote>:][container] "
-"<key>                                 Unset container or server "
-"configuration key.\n"
-"lxc config show [<remote>:][container] [--"
-"expanded]                           Show container or server configuration.\n"
-"lxc config edit [<remote>:]"
-"[container]                                        Edit container or server "
-"configuration in external editor.\n"
-"    Edit configuration, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc config edit <container> # launch editor\n"
-"             cat config.yaml | lxc config edit <container> # read from "
-"config.yaml\n"
-"\n"
-"lxc config trust list "
-"[<remote>:]                                             List all trusted "
-"certs.\n"
-"lxc config trust add [<remote>:] <certfile."
-"crt>                               Add certfile.crt to trusted hosts.\n"
-"lxc config trust remove [<remote>:] [hostname|"
-"fingerprint]                    Remove the cert from trusted hosts.\n"
-"\n"
-"Examples:\n"
-"To mount host's /share/c1 onto /opt in the container:\n"
-"    lxc config device add [<remote>:]container1 <device-name> disk source=/"
-"share/c1 path=opt\n"
-"\n"
-"To set an lxc config value:\n"
-"    lxc config set [<remote>:]<container> raw.lxc 'lxc.aa_allow_incomplete = "
-"1'\n"
-"\n"
-"To listen on IPv4 and IPv6 port 8443 (you can omit the 8443 its the "
-"default):\n"
-"    lxc config set core.https_address [::]:8443\n"
-"\n"
-"To set the server trust password:\n"
-"    lxc config set core.trust_password blah"
+#: lxc/file.go:281
+msgid "More than one file to download, but target is not a directory"
 msgstr ""
 
-#: lxc/file.go:36
-msgid ""
-"Manage files in a container.\n"
-"\n"
-"lxc file pull [-r|--recursive] [<remote>:]<container> "
-"[[<remote>:]<container>...] <target path>\n"
-"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
-"mode=MODE] <source path> [<source path>...] [<remote>:]<container>\n"
-"lxc file delete [<remote>:]<container> [[<remote>:]<container>...]\n"
-"lxc file edit [<remote>:]<container>/<path>\n"
-"\n"
-"<source> in the case of pull, <target> in the case of push and <file> in the "
-"case of edit are <container name>/<path>\n"
-"\n"
-"Examples:\n"
-"To push /etc/hosts into the container foo:\n"
-"    lxc file push /etc/hosts foo/etc/hosts\n"
-"\n"
-"To pull /etc/hosts from the container:\n"
-"    lxc file pull foo/etc/hosts ."
+#: lxc/action.go:68
+msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/network.go:49
-msgid ""
-"Manage networks.\n"
-"\n"
-"lxc network list [<remote>:]                              List available "
-"networks.\n"
-"lxc network show [<remote>:]<network>                     Show details of a "
-"network.\n"
-"lxc network create [<remote>:]<network> [key=value...]    Create a network.\n"
-"lxc network get [<remote>:]<network> <key>                Get network "
-"configuration.\n"
-"lxc network set [<remote>:]<network> <key> <value>        Set network "
-"configuration.\n"
-"lxc network unset [<remote>:]<network> <key>              Unset network "
-"configuration.\n"
-"lxc network delete [<remote>:]<network>                   Delete a network.\n"
-"lxc network edit [<remote>:]<network>\n"
-"    Edit network, either by launching external editor or reading STDIN.\n"
-"    Example: lxc network edit <network> # launch editor\n"
-"             cat network.yaml | lxc network edit <network> # read from "
-"network.yaml\n"
-"\n"
-"lxc network attach [<remote>:]<network> <container> [device name] [interface "
-"name]\n"
-"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
-"[interface name]\n"
-"\n"
-"lxc network detach [<remote>:]<network> <container> [device name]\n"
-"lxc network detach-profile [<remote>:]<network> <container> [device name]"
+#: lxc/list.go:433 lxc/network.go:458 lxc/profile.go:499 lxc/remote.go:394
+#: lxc/storage.go:607 lxc/storage.go:687
+msgid "NAME"
 msgstr ""
 
-#: lxc/remote.go:37
-msgid ""
-"Manage remote LXD servers.\n"
-"\n"
-"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
-"password=PASSWORD]\n"
-"                                        [--public] [--protocol=PROTOCOL]    "
-"Add the remote <remote> at <url>.\n"
-"lxc remote remove <remote>                                                  "
-"Remove the remote <remote>.\n"
-"lxc remote list                                                             "
-"List all remotes.\n"
-"lxc remote rename <old name> <new name>                                     "
-"Rename remote <old name> to <new name>.\n"
-"lxc remote set-url <remote> <url>                                           "
-"Update <remote>'s url to <url>.\n"
-"lxc remote set-default <remote>                                             "
-"Set the default remote.\n"
-"lxc remote get-default                                                      "
-"Print the default remote."
+#: lxc/network.go:444 lxc/remote.go:368 lxc/remote.go:373
+msgid "NO"
 msgstr ""
 
-#: lxc/storage.go:61
-msgid ""
-"Manage storage.\n"
-"\n"
-"lxc storage list [<remote>:]                                    List "
-"available storage pools.\n"
-"lxc storage show [<remote>:]<pool>                              Show details "
-"of a storage pool.\n"
-"lxc storage create [<remote>:]<pool> <driver> [key=value]...    Create a "
-"storage pool.\n"
-"lxc storage get [<remote>:]<pool> <key>                         Get storage "
-"pool configuration.\n"
-"lxc storage set [<remote>:]<pool> <key> <value>                 Set storage "
-"pool configuration.\n"
-"lxc storage unset [<remote>:]<pool> <key>                       Unset "
-"storage pool configuration.\n"
-"lxc storage delete [<remote>:]<pool>                            Delete a "
-"storage pool.\n"
-"lxc storage edit [<remote>:]<pool>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage edit [<remote>:]<pool> # launch editor\n"
-"             cat pool.yaml | lxc storage edit [<remote>:]<pool> # read from "
-"pool.yaml\n"
-"\n"
-"lxc storage volume list [<remote>:]<pool>                              List "
-"available storage volumes on a storage pool.\n"
-"lxc storage volume show [<remote>:]<pool> <volume>                     Show "
-"details of a storage volume on a storage pool.\n"
-"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...    "
-"Create a storage volume on a storage pool.\n"
-"lxc storage volume get [<remote>:]<pool> <volume> <key>                Get "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>        Set "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume unset [<remote>:]<pool> <volume> <key>              Unset "
-"storage volume configuration on a storage pool.\n"
-"lxc storage volume delete [<remote>:]<pool> <volume>                   "
-"Delete a storage volume on a storage pool.\n"
-"lxc storage volume edit [<remote>:]<pool> <volume>\n"
-"    Edit storage pool, either by launching external editor or reading "
-"STDIN.\n"
-"    Example: lxc storage volume edit [<remote>:]<pool> <volume> # launch "
-"editor\n"
-"             cat pool.yaml | lxc storage volume edit [<remote>:]<pool> "
-"<volume> # read from pool.yaml\n"
-"\n"
-"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
-"name] <path>\n"
-"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name] <path>\n"
-"\n"
-"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
-"name]\n"
-"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
-"[device name]\n"
-"\n"
-"\n"
-"Unless specified through a prefix, all volume operations affect \"custom"
-"\" (user created) volumes.\n"
-"\n"
-"Examples:\n"
-"To show the properties of a custom volume called \"data\" in the \"default\" "
-"pool:\n"
-"    lxc storage volume show default data\n"
-"\n"
-"To show the properties of the filesystem for a container called \"data\" in "
-"the \"default\" pool:\n"
-"    lxc storage volume show default container/data\n"
+#: lxc/info.go:91
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: lxc/image.go:62
-msgid ""
-"Manipulate container images.\n"
-"\n"
-"In LXD containers are created from images. Those images were themselves\n"
-"either generated from an existing container or downloaded from an image\n"
-"server.\n"
-"\n"
-"When using remote images, LXD will automatically cache images for you\n"
-"and remove them upon expiration.\n"
-"\n"
-"The image unique identifier is the hash (sha-256) of its representation\n"
-"as a compressed tarball (or for split images, the concatenation of the\n"
-"metadata and rootfs tarballs).\n"
-"\n"
-"Images can be referenced by their full hash, shortest unique partial\n"
-"hash or alias name (if one is set).\n"
-"\n"
-"\n"
-"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
-"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
-"[--alias=ALIAS...] [prop=value]\n"
-"    Import an image tarball (or tarballs) into the LXD image store.\n"
-"\n"
-"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-"
-"aliases] [--public] [--auto-update]\n"
-"    Copy an image from one LXD daemon to another over the network.\n"
-"\n"
-"    The auto-update flag instructs the server to keep this image up to\n"
-"    date. It requires the source to be an alias and for it to be public.\n"
-"\n"
-"lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
-"    Delete one or more images from the LXD image store.\n"
-"\n"
-"lxc image export [<remote>:]<image> [target]\n"
-"    Export an image from the LXD image store into a distributable tarball.\n"
-"\n"
-"    The output target is optional and defaults to the working directory.\n"
-"    The target may be an existing directory, file name, or \"-\" to specify\n"
-"    stdout.  The target MUST be a directory when exporting a split image.\n"
-"    If the target is a directory, the image's name (each part's name for\n"
-"    split images) as found in the database will be used for the exported\n"
-"    image.  If the target is a file (not a directory and not stdout), then\n"
-"    the appropriate extension will be appended to the provided file name\n"
-"    based on the algorithm used to compress the image. \n"
-"\n"
-"lxc image info [<remote>:]<image>\n"
-"    Print everything LXD knows about a given image.\n"
-"\n"
-"lxc image list [<remote>:] [filter] [--format table|json]\n"
-"    List images in the LXD image store. Filters may be of the\n"
-"    <key>=<value> form for property based filtering, or part of the image\n"
-"    hash or part of the image alias name.\n"
-"\n"
-"lxc image show [<remote>:]<image>\n"
-"    Yaml output of the user modifiable properties of an image.\n"
-"\n"
-"lxc image edit [<remote>:]<image>\n"
-"    Edit image, either by launching external editor or reading STDIN.\n"
-"    Example: lxc image edit <image> # launch editor\n"
-"             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
-"\n"
-"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
-"    Create a new alias for an existing image.\n"
-"\n"
-"lxc image alias delete [<remote>:]<alias>\n"
-"    Delete an alias.\n"
-"\n"
-"lxc image alias list [<remote>:] [filter]\n"
-"    List the aliases. Filters may be part of the image hash or part of the "
-"image alias name."
-msgstr ""
-
-#: lxc/info.go:161
-msgid "Memory (current)"
-msgstr ""
-
-#: lxc/info.go:165
-msgid "Memory (peak)"
-msgstr ""
-
-#: lxc/info.go:177
-#, fuzzy
-msgid "Memory usage:"
-msgstr " Использование памяти:"
-
-#: lxc/help.go:87
-msgid "Missing summary."
-msgstr ""
-
-#: lxc/monitor.go:41
-msgid ""
-"Monitor activity on the LXD server.\n"
-"\n"
-"lxc monitor [<remote>:] [--type=TYPE...]\n"
-"\n"
-"Connects to the monitoring interface of the specified LXD server.\n"
-"\n"
-"By default will listen to all message types.\n"
-"Specific types to listen to can be specified with --type.\n"
-"\n"
-"Example:\n"
-"    lxc monitor --type=logging"
-msgstr ""
-
-#: lxc/network.go:224 lxc/network.go:273 lxc/storage.go:324 lxc/storage.go:424
-msgid "More than one device matches, specify the device name."
-msgstr ""
-
-#: lxc/file.go:274
-msgid "More than one file to download, but target is not a directory"
-msgstr ""
-
-#: lxc/move.go:16
-msgid ""
-"Move containers within or in between lxd instances.\n"
-"\n"
-"lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
-"    Move a container between two hosts, renaming it if destination name "
-"differs.\n"
-"\n"
-"lxc move <old name> <new name>\n"
-"    Rename a local container.\n"
-"\n"
-"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
-"    Rename a snapshot."
-msgstr ""
-
-#: lxc/action.go:67
-msgid "Must supply container name for: "
-msgstr ""
-
-#: lxc/list.go:409 lxc/network.go:434 lxc/profile.go:460 lxc/remote.go:380
-#: lxc/storage.go:569 lxc/storage.go:649
-msgid "NAME"
-msgstr ""
-
-#: lxc/network.go:420 lxc/remote.go:354 lxc/remote.go:359
-msgid "NO"
-msgstr ""
-
-#: lxc/info.go:89
-#, c-format
-msgid "Name: %s"
-msgstr ""
-
-#: lxc/network.go:198
+#: lxc/network.go:222
 #, c-format
 msgid "Network %s created"
 msgstr ""
 
-#: lxc/network.go:301
+#: lxc/network.go:325
 #, c-format
 msgid "Network %s deleted"
 msgstr ""
 
-#: lxc/init.go:143 lxc/init.go:144
+#: lxc/init.go:141 lxc/init.go:142
 msgid "Network name"
 msgstr ""
 
-#: lxc/info.go:194
+#: lxc/info.go:196
 #, fuzzy
 msgid "Network usage:"
 msgstr " Использование сети:"
 
-#: lxc/image.go:134 lxc/publish.go:35
+#: lxc/image.go:136 lxc/publish.go:35
 msgid "New alias to define at target"
 msgstr ""
 
-#: lxc/config.go:285
+#: lxc/config.go:321
 msgid "No certificate provided to add"
 msgstr ""
 
-#: lxc/network.go:233 lxc/network.go:282
+#: lxc/network.go:257 lxc/network.go:306
 msgid "No device found for this network"
 msgstr ""
 
-#: lxc/storage.go:333 lxc/storage.go:433
+#: lxc/storage.go:371 lxc/storage.go:471
 msgid "No device found for this storage volume."
 msgstr ""
 
-#: lxc/config.go:308
+#: lxc/config.go:344
 msgid "No fingerprint specified."
 msgstr ""
 
-#: lxc/storage.go:285 lxc/storage.go:369
+#: lxc/storage.go:323 lxc/storage.go:407
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:120
+#: lxc/remote.go:134
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:396
+#: lxc/image.go:398
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
-#: lxc/network.go:330 lxc/network.go:457
+#: lxc/network.go:354 lxc/network.go:481
 msgid "Only managed networks can be modified."
 msgstr ""
 
-#: lxc/help.go:63 lxc/main.go:112
+#: lxc/help.go:71 lxc/main.go:112 lxc/main.go:163
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:507
+#: lxc/image.go:509
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -1240,247 +687,219 @@ msgstr ""
 msgid "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr ""
 
-#: lxc/list.go:556
+#: lxc/list.go:580
 msgid "PERSISTENT"
 msgstr ""
 
-#: lxc/list.go:410
+#: lxc/list.go:434
 msgid "PID"
 msgstr ""
 
-#: lxc/list.go:411
+#: lxc/list.go:435
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:382
+#: lxc/remote.go:396
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:609 lxc/remote.go:383
+#: lxc/image.go:611 lxc/remote.go:397
 msgid "PUBLIC"
 msgstr ""
 
-#: lxc/info.go:188
+#: lxc/info.go:190
 msgid "Packets received"
 msgstr ""
 
-#: lxc/info.go:189
+#: lxc/info.go:191
 msgid "Packets sent"
 msgstr ""
 
-#: lxc/help.go:70
+#: lxc/help.go:78
 msgid "Path to an alternate client configuration directory"
 msgstr ""
 
-#: lxc/help.go:71
+#: lxc/help.go:79
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:31
+#: lxc/main.go:202
+msgid "Pause containers."
+msgstr ""
+
+#: lxc/main.go:34
 msgid "Permission denied, are you in the lxd group?"
 msgstr ""
 
-#: lxc/info.go:106
+#: lxc/info.go:108
 #, c-format
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/network.go:355 lxc/profile.go:219 lxc/storage.go:498 lxc/storage.go:803
+#: lxc/network.go:379 lxc/profile.go:258 lxc/storage.go:536 lxc/storage.go:841
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:536 lxc/config.go:601 lxc/image.go:704
+#: lxc/config.go:572 lxc/config.go:637 lxc/image.go:706
 msgid "Press enter to start the editor again"
 msgstr ""
 
-#: lxc/manpage.go:18
-msgid "Print all the subcommands help."
-msgstr ""
-
-#: lxc/help.go:65
+#: lxc/help.go:73
 msgid "Print debug information"
 msgstr ""
 
-#: lxc/help.go:64
+#: lxc/help.go:72
 msgid "Print less common commands"
 msgstr ""
 
-#: lxc/help.go:66
+#: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
 
-#: lxc/version.go:18
-msgid ""
-"Prints the version number of this client tool.\n"
-"\n"
-"lxc version"
-msgstr ""
-
-#: lxc/info.go:130
+#: lxc/info.go:132
 #, c-format
 msgid "Processes: %d"
 msgstr ""
 
-#: lxc/profile.go:275
+#: lxc/profile.go:314
 #, c-format
 msgid "Profile %s added to %s"
 msgstr ""
 
-#: lxc/profile.go:170
+#: lxc/profile.go:209
 #, c-format
 msgid "Profile %s created"
 msgstr ""
 
-#: lxc/profile.go:240
+#: lxc/profile.go:279
 #, c-format
 msgid "Profile %s deleted"
 msgstr ""
 
-#: lxc/profile.go:306
+#: lxc/profile.go:345
 #, c-format
 msgid "Profile %s removed from %s"
 msgstr ""
 
-#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:139 lxc/init.go:140
+#: lxc/copy.go:34 lxc/copy.go:35 lxc/init.go:137 lxc/init.go:138
 msgid "Profile to apply to the new container"
 msgstr ""
 
-#: lxc/profile.go:256
+#: lxc/profile.go:295
 #, c-format
 msgid "Profiles %s applied to %s"
 msgstr ""
 
-#: lxc/info.go:104
+#: lxc/info.go:106
 #, c-format
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:330
+#: lxc/image.go:332
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:54
+#: lxc/remote.go:68
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:313
+#: lxc/image.go:315
 #, c-format
 msgid "Public: %s"
 msgstr ""
 
-#: lxc/publish.go:27
-msgid ""
-"Publish containers as images.\n"
-"\n"
-"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
-"alias=ALIAS...] [prop-key=prop-value...]"
-msgstr ""
-
-#: lxc/file.go:58 lxc/file.go:59
+#: lxc/file.go:65 lxc/file.go:66
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/remote.go:52
+#: lxc/remote.go:66
 msgid "Remote admin password"
 msgstr ""
 
-#: lxc/info.go:91
+#: lxc/info.go:93
 #, c-format
 msgid "Remote: %s"
 msgstr ""
 
-#: lxc/delete.go:43
+#: lxc/delete.go:41
 #, c-format
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/delete.go:37 lxc/delete.go:38
+#: lxc/delete.go:35 lxc/delete.go:36
 msgid "Require user confirmation"
 msgstr ""
 
-#: lxc/info.go:127
+#: lxc/info.go:129
 msgid "Resources:"
 msgstr ""
 
-#: lxc/restore.go:21
-msgid ""
-"Restore a container's state to a previous snapshot.\n"
-"\n"
-"lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
-"\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
-"\n"
-"Examples:\n"
-"Create the snapshot:\n"
-"    lxc snapshot u1 snap0\n"
-"\n"
-"Restore the snapshot:\n"
-"    lxc restore u1 snap0"
+#: lxc/main.go:210
+msgid "Restart containers."
 msgstr ""
 
-#: lxc/init.go:256
+#: lxc/init.go:254
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:612
+#: lxc/image.go:614
 msgid "SIZE"
 msgstr ""
 
-#: lxc/list.go:412
+#: lxc/list.go:436
 msgid "SNAPSHOTS"
 msgstr ""
 
-#: lxc/storage.go:571
+#: lxc/storage.go:609
 msgid "SOURCE"
 msgstr ""
 
-#: lxc/list.go:413
+#: lxc/list.go:437
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:384
+#: lxc/remote.go:398
 msgid "STATIC"
 msgstr ""
 
-#: lxc/list.go:415
+#: lxc/list.go:439
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:225
+#: lxc/remote.go:239
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:287
+#: lxc/remote.go:301
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:53
+#: lxc/remote.go:67
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
-#: lxc/file.go:56
+#: lxc/file.go:63
 msgid "Set the file's gid on push"
 msgstr ""
 
-#: lxc/file.go:57
+#: lxc/file.go:64
 msgid "Set the file's perms on push"
 msgstr ""
 
-#: lxc/file.go:55
+#: lxc/file.go:62
 msgid "Set the file's uid on push"
 msgstr ""
 
-#: lxc/help.go:32
+#: lxc/help.go:29
 msgid "Show all commands (not just interesting ones)"
 msgstr ""
 
-#: lxc/help.go:67
+#: lxc/help.go:75
 msgid "Show client version"
 msgstr ""
 
-#: lxc/info.go:36
+#: lxc/info.go:38
 msgid "Show the container's last 100 log lines?"
 msgstr ""
 
@@ -1488,83 +907,91 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:311
+#: lxc/image.go:313
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
 
-#: lxc/info.go:208
+#: lxc/info.go:210
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/action.go:133
+#: lxc/action.go:134
 #, fuzzy, c-format
 msgid "Some containers failed to %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:340
+#: lxc/image.go:342
 msgid "Source:"
 msgstr ""
 
-#: lxc/launch.go:148
+#: lxc/main.go:220
+msgid "Start containers."
+msgstr ""
+
+#: lxc/launch.go:146
 #, c-format
 msgid "Starting %s"
 msgstr ""
 
-#: lxc/info.go:98
+#: lxc/info.go:100
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
+#: lxc/main.go:226
+msgid "Stop containers."
+msgstr ""
+
 #: lxc/publish.go:36 lxc/publish.go:37
 msgid "Stop the container if currently running"
 msgstr ""
 
-#: lxc/delete.go:107 lxc/publish.go:114
+#: lxc/delete.go:105 lxc/publish.go:114
 msgid "Stopping container failed!"
 msgstr ""
 
-#: lxc/storage.go:398
+#: lxc/storage.go:436
 #, c-format
 msgid "Storage pool %s created"
 msgstr ""
 
-#: lxc/storage.go:448
+#: lxc/storage.go:486
 #, c-format
 msgid "Storage pool %s deleted"
 msgstr ""
 
-#: lxc/init.go:145 lxc/init.go:146
+#: lxc/init.go:143 lxc/init.go:144
 msgid "Storage pool name"
 msgstr ""
 
-#: lxc/storage.go:672
+#: lxc/storage.go:710
 #, c-format
 msgid "Storage volume %s created"
 msgstr ""
 
-#: lxc/storage.go:682
+#: lxc/storage.go:720
 #, c-format
 msgid "Storage volume %s deleted"
 msgstr ""
 
-#: lxc/action.go:48
+#: lxc/action.go:49
 msgid "Store the container state (only for stop)"
 msgstr ""
 
-#: lxc/info.go:169
+#: lxc/info.go:171
 msgid "Swap (current)"
 msgstr ""
 
-#: lxc/info.go:173
+#: lxc/info.go:175
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:414 lxc/network.go:435 lxc/storage.go:648
+#: lxc/list.go:438 lxc/network.go:459 lxc/storage.go:686
 msgid "TYPE"
 msgstr ""
 
-#: lxc/delete.go:93
+#: lxc/delete.go:91
 msgid "The container is currently running, stop it first or pass --force."
 msgstr ""
 
@@ -1574,29 +1001,29 @@ msgid ""
 "restarted."
 msgstr ""
 
-#: lxc/init.go:329
+#: lxc/init.go:327
 msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
-#: lxc/config.go:680 lxc/config.go:692 lxc/config.go:725 lxc/config.go:743
-#: lxc/config.go:781 lxc/config.go:799
+#: lxc/config.go:716 lxc/config.go:728 lxc/config.go:761 lxc/config.go:779
+#: lxc/config.go:817 lxc/config.go:835
 msgid "The device doesn't exist"
 msgstr ""
 
-#: lxc/init.go:313
+#: lxc/init.go:311
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
 
-#: lxc/main.go:181
-msgid "The opposite of `lxc pause` is `lxc start`."
+#: lxc/action.go:34
+msgid "The opposite of \"lxc pause\" is \"lxc start\"."
 msgstr ""
 
-#: lxc/network.go:238 lxc/network.go:287 lxc/storage.go:338 lxc/storage.go:438
+#: lxc/network.go:262 lxc/network.go:311 lxc/storage.go:376 lxc/storage.go:476
 msgid "The specified device doesn't exist"
 msgstr ""
 
-#: lxc/network.go:242 lxc/network.go:291
+#: lxc/network.go:266 lxc/network.go:315
 msgid "The specified device doesn't match the network"
 msgstr ""
 
@@ -1604,152 +1031,869 @@ msgstr ""
 msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
-#: lxc/action.go:44
+#: lxc/help.go:47
+msgid ""
+"This is the LXD command line client.\n"
+"\n"
+"All of LXD's features can be driven through the various commands below.\n"
+"For help with any of those, simply call them with --help."
+msgstr ""
+
+#: lxc/action.go:45
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:314
+#: lxc/image.go:316
 msgid "Timestamps:"
 msgstr ""
 
-#: lxc/init.go:331
+#: lxc/init.go:329
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:330
+#: lxc/init.go:328
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
-#: lxc/main.go:137
+#: lxc/main.go:140
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:398
+#: lxc/image.go:400
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/action.go:97 lxc/launch.go:161
+#: lxc/action.go:98 lxc/launch.go:159
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
 
-#: lxc/info.go:100
+#: lxc/info.go:102
 msgid "Type: ephemeral"
 msgstr ""
 
-#: lxc/info.go:102
+#: lxc/info.go:104
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:613
+#: lxc/image.go:615
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:381
+#: lxc/remote.go:395
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:437 lxc/profile.go:461 lxc/storage.go:572 lxc/storage.go:650
+#: lxc/network.go:461 lxc/profile.go:500 lxc/storage.go:610 lxc/storage.go:688
 msgid "USED BY"
 msgstr ""
 
-#: lxc/remote.go:95
+#: lxc/manpage.go:36
+msgid "Unable to find help2man."
+msgstr ""
+
+#: lxc/remote.go:109
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:319
+#: lxc/image.go:321
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
 
-#: lxc/main.go:112
-#, c-format
-msgid "Usage: %s"
+#: lxc/action.go:37
+#, fuzzy, c-format
+msgid ""
+"Usage: lxc %s [<remote>:]<container> [[<remote>:]<container>...]\n"
+"\n"
+"%s%s"
 msgstr ""
+"Изменение состояния одного или нескольких контейнеров %s.\n"
+"\n"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/help.go:48
+#: lxc/help.go:45
 msgid "Usage: lxc <command> [options]"
 msgstr ""
 
-#: lxc/delete.go:47
-msgid "User aborted delete operation."
-msgstr ""
-
-#: lxc/restore.go:38
+#: lxc/config.go:58
 msgid ""
-"Whether or not to restore the container's running state from snapshot (if "
-"available)"
-msgstr ""
-
-#: lxc/snapshot.go:38
-msgid "Whether or not to snapshot the container's running state"
-msgstr ""
-
-#: lxc/network.go:422 lxc/remote.go:356 lxc/remote.go:361
-msgid "YES"
-msgstr ""
-
-#: lxc/main.go:52
-msgid "`lxc config profile` is deprecated, please use `lxc profile`"
-msgstr ""
-
-#: lxc/launch.go:132
-msgid "bad number of things scanned from image, container or snapshot"
-msgstr ""
-
-#: lxc/action.go:93
-msgid "bad result type from action"
-msgstr ""
-
-#: lxc/copy.go:116
-msgid "can't copy to the same container name"
-msgstr ""
-
-#: lxc/file.go:309
-msgid "can't pull a directory without --recursive"
-msgstr ""
-
-#: lxc/remote.go:344
-msgid "can't remove the default remote"
-msgstr ""
-
-#: lxc/file.go:120
-msgid "can't supply uid/gid/mode in recursive mode"
+"Usage: lxc config <subcommand> [options]\n"
+"\n"
+"Change container or server configuration options.\n"
+"\n"
+"*Container configuration*\n"
+"\n"
+"lxc config get [<remote>:][container] <key>\n"
+"    Get container or server configuration key.\n"
+"\n"
+"lxc config set [<remote>:][container] <key> <value>\n"
+"    Set container or server configuration key.\n"
+"\n"
+"lxc config unset [<remote>:][container] <key>\n"
+"    Unset container or server configuration key.\n"
+"\n"
+"lxc config show [<remote>:][container] [--expanded]\n"
+"    Show container or server configuration.\n"
+"\n"
+"lxc config edit [<remote>:][container]\n"
+"    Edit configuration, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Device management*\n"
+"\n"
+"lxc config device add [<remote>:]<container> <device> <type> [key=value...]\n"
+"    Add a device to a container.\n"
+"\n"
+"lxc config device get [<remote>:]<container> <device> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc config device set [<remote>:]<container> <device> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc config device unset [<remote>:]<container> <device> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc config device list [<remote>:]<container>\n"
+"    List devices for container.\n"
+"\n"
+"lxc config device show [<remote>:]<container>\n"
+"    Show full device details for container.\n"
+"\n"
+"lxc config device remove [<remote>:]<container> <name>\n"
+"    Remove device from container.\n"
+"\n"
+"*Client trust store management*\n"
+"\n"
+"lxc config trust list [<remote>:]\n"
+"    List all trusted certs.\n"
+"\n"
+"lxc config trust add [<remote>:] <certfile.crt>\n"
+"    Add certfile.crt to trusted hosts.\n"
+"\n"
+"lxc config trust remove [<remote>:] [hostname|fingerprint]\n"
+"    Remove the cert from trusted hosts.\n"
+"\n"
+"*Examples*\n"
+"\n"
+"cat config.yaml | lxc config edit <container>\n"
+"    Update the container configuration from config.yaml.\n"
+"\n"
+"lxc config device add [<remote>:]container1 <device-name> disk source=/share/"
+"c1 path=opt\n"
+"    Will mount the host's /share/c1 onto /opt in the container.\n"
+"\n"
+"lxc config set [<remote>:]<container> limits.cpu 2\n"
+"    Will set a CPU limit of \"2\" for the container.\n"
+"\n"
+"lxc config set core.https_address [::]:8443\n"
+"    Will have LXD listen on IPv4 and IPv6 port 8443.\n"
+"\n"
+"lxc config set core.trust_password blah\n"
+"    Will set the server's trust password to blah."
 msgstr ""
 
-#: lxc/remote.go:370
-msgid "default"
+#: lxc/copy.go:25
+#, fuzzy
+msgid ""
+"Usage: lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] "
+"[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]\n"
+"\n"
+"Copy containers within or in between LXD instances."
 msgstr ""
+"Копирование контейнеров внутри или в между экземплярами LXD.\n"
+"\n"
+"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
+"ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
 
-#: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
-#: lxc/init.go:236 lxc/init.go:241 lxc/launch.go:116 lxc/launch.go:121
-msgid "didn't get any affected image, container or snapshot from server"
+#: lxc/delete.go:26
+msgid ""
+"Usage: lxc delete [<remote>:]<container>[/<snapshot>] "
+"[[<remote>:]<container>[/<snapshot>]...]\n"
+"\n"
+"Delete containers and snapshots."
 msgstr ""
 
-#: lxc/image.go:305
-msgid "disabled"
+#: lxc/exec.go:46
+msgid ""
+"Usage: lxc exec [<remote>:]<container> [--mode=auto|interactive|non-"
+"interactive] [--env KEY=VALUE...] [--] <command line>\n"
+"\n"
+"Execute commands in containers.\n"
+"\n"
+"Mode defaults to non-interactive, interactive mode is selected if both stdin "
+"AND stdout are terminals (stderr is ignored)."
 msgstr ""
 
-#: lxc/image.go:307
-msgid "enabled"
+#: lxc/file.go:36
+msgid ""
+"Usage: lxc file <subcommand> [options]\n"
+"\n"
+"Manage files in containers.\n"
+"\n"
+"lxc file pull [-r|--recursive] [<remote>:]<container>/<path> "
+"[[<remote>:]<container>/<path>...] <target path>\n"
+"    Pull files from containers.\n"
+"\n"
+"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
+"mode=MODE] <source path> [<source path>...] [<remote>:]<container>/<path>\n"
+"    Push files into containers.\n"
+"\n"
+"lxc file delete [<remote>:]<container>/<path> [[<remote>:]<container>/"
+"<path>...]\n"
+"    Delete files in containers.\n"
+"\n"
+"lxc file edit [<remote>:]<container>/<path>\n"
+"    Edit files in containers using the default text editor.\n"
+"\n"
+"*Examples*\n"
+"lxc file push /etc/hosts foo/etc/hosts\n"
+"   To push /etc/hosts into the container \"foo\".\n"
+"\n"
+"lxc file pull foo/etc/hosts .\n"
+"   To pull /etc/hosts from the container and write it to the current "
+"directory."
 msgstr ""
 
-#: lxc/action.go:125 lxc/main.go:22 lxc/main.go:148
-#, c-format
-msgid "error: %v"
+#: lxc/finger.go:15
+msgid ""
+"Usage: lxc finger [<remote>:]\n"
+"\n"
+"Check if the LXD server is alive."
 msgstr ""
 
-#: lxc/help.go:40 lxc/main.go:107
-#, c-format
-msgid "error: unknown command: %s"
+#: lxc/help.go:22
+msgid ""
+"Usage: lxc help [--all]\n"
+"\n"
+"Help page for the LXD client."
 msgstr ""
 
-#: lxc/launch.go:136
-msgid "got bad version"
-msgstr ""
+#: lxc/image.go:62
+msgid ""
+"Usage: lxc image <subcommand> [options]\n"
+"\n"
+"Manipulate container images.\n"
+"\n"
+"In LXD containers are created from images. Those images were themselves\n"
+"either generated from an existing container or downloaded from an image\n"
+"server.\n"
+"\n"
+"When using remote images, LXD will automatically cache images for you\n"
+"and remove them upon expiration.\n"
+"\n"
+"The image unique identifier is the hash (sha-256) of its representation\n"
+"as a compressed tarball (or for split images, the concatenation of the\n"
+"metadata and rootfs tarballs).\n"
+"\n"
+"Images can be referenced by their full hash, shortest unique partial\n"
+"hash or alias name (if one is set).\n"
+"\n"
+"\n"
+"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
+"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
+"[--alias=ALIAS...] [prop=value]\n"
+"    Import an image tarball (or tarballs) into the LXD image store.\n"
+"\n"
+"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS...] [--copy-"
+"aliases] [--public] [--auto-update]\n"
+"    Copy an image from one LXD daemon to another over the network.\n"
+"\n"
+"    The auto-update flag instructs the server to keep this image up to\n"
+"    date. It requires the source to be an alias and for it to be public.\n"
+"\n"
+"lxc image delete [<remote>:]<image> [[<remote>:]<image>...]\n"
+"    Delete one or more images from the LXD image store.\n"
+"\n"
+"lxc image export [<remote>:]<image> [target]\n"
+"    Export an image from the LXD image store into a distributable tarball.\n"
+"\n"
+"    The output target is optional and defaults to the working directory.\n"
+"    The target may be an existing directory, file name, or \"-\" to specify\n"
+"    stdout.  The target MUST be a directory when exporting a split image.\n"
+"    If the target is a directory, the image's name (each part's name for\n"
+"    split images) as found in the database will be used for the exported\n"
+"    image.  If the target is a file (not a directory and not stdout), then\n"
+"    the appropriate extension will be appended to the provided file name\n"
+"    based on the algorithm used to compress the image. \n"
+"\n"
+"lxc image info [<remote>:]<image>\n"
+"    Print everything LXD knows about a given image.\n"
+"\n"
+"lxc image list [<remote>:] [filter] [--format table|json]\n"
+"    List images in the LXD image store. Filters may be of the\n"
+"    <key>=<value> form for property based filtering, or part of the image\n"
+"    hash or part of the image alias name.\n"
+"\n"
+"lxc image show [<remote>:]<image>\n"
+"    Yaml output of the user modifiable properties of an image.\n"
+"\n"
+"lxc image edit [<remote>:]<image>\n"
+"    Edit image, either by launching external editor or reading STDIN.\n"
+"    Example: lxc image edit <image> # launch editor\n"
+"             cat image.yaml | lxc image edit <image> # read from image.yaml\n"
+"\n"
+"lxc image alias create [<remote>:]<alias> <fingerprint>\n"
+"    Create a new alias for an existing image.\n"
+"\n"
+"lxc image alias delete [<remote>:]<alias>\n"
+"    Delete an alias.\n"
+"\n"
+"lxc image alias list [<remote>:] [filter]\n"
+"    List the aliases. Filters may be part of the image hash or part of the "
+"image alias name."
+msgstr ""
+
+#: lxc/info.go:25
+msgid ""
+"Usage: lxc info [<remote>:][<container>] [--show-log]\n"
+"\n"
+"Show container or server information.\n"
+"\n"
+"lxc info [<remote>:]<container> [--show-log]\n"
+"    For container information.\n"
+"\n"
+"lxc info [<remote>:]\n"
+"    For LXD server information."
+msgstr ""
+
+#: lxc/init.go:75
+msgid ""
+"Usage: lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc init ubuntu:16.04 u1"
+msgstr ""
+
+#: lxc/launch.go:23
+msgid ""
+"Usage: lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>] [--storage|-s <pool>]\n"
+"\n"
+"Create and start containers from images.\n"
+"\n"
+"Not specifying -p will result in the default profile.\n"
+"Specifying \"-p\" with no argument will result in no profile.\n"
+"\n"
+"Examples:\n"
+"    lxc launch ubuntu:16.04 u1"
+msgstr ""
+
+#: lxc/list.go:47
+msgid ""
+"Usage: lxc list [<remote>:] [filters] [--format table|json] [-c <columns>] "
+"[--fast]\n"
+"\n"
+"List the existing containers.\n"
+"\n"
+"Default column layout: ns46tS\n"
+"Fast column layout: nsacPt\n"
+"\n"
+"*Filters*\n"
+"A single keyword like \"web\" which will list any container with a name "
+"starting by \"web\".\n"
+"\n"
+"A regular expression on the container name. (e.g. .*web.*01$).\n"
+"\n"
+"A key/value pair referring to a configuration item. For those, the namespace "
+"can be abbreviated to the smallest unambiguous identifier.\n"
+"    - \"user.blah=abc\" will list all containers with the \"blah\" user "
+"property set to \"abc\".\n"
+"\n"
+"    - \"u.blah=abc\" will do the same\n"
+"\n"
+"    - \"security.privileged=1\" will list all privileged containers\n"
+"\n"
+"    - \"s.privileged=1\" will do the same\n"
+"\n"
+"A regular expression matching a configuration item or its value. (e.g. "
+"volatile.eth0.hwaddr=00:16:3e:.*).\n"
+"\n"
+"*Columns*\n"
+"The -c option takes a comma separated list of arguments that control\n"
+"which container attributes to output when displaying in table format.\n"
+"\n"
+"Column arguments are either pre-defined shorthand chars (see below),\n"
+"or (extended) config keys.\n"
+"\n"
+"Commas between consecutive shorthand chars are optional.\n"
+"\n"
+"Pre-defined column shorthand chars:\n"
+"\n"
+"    4 - IPv4 address\n"
+"\n"
+"    6 - IPv6 address\n"
+"\n"
+"    a - Architecture\n"
+"\n"
+"    b - Storage pool\n"
+"\n"
+"    c - Creation date\n"
+"\n"
+"    l - Last used date\n"
+"\n"
+"    n - Name\n"
+"\n"
+"    p - PID of the container's init process\n"
+"\n"
+"    P - Profiles\n"
+"\n"
+"    s - State\n"
+"\n"
+"    S - Number of snapshots\n"
+"\n"
+"    t - Type (persistent or ephemeral)\n"
+"\n"
+"Custom columns are defined with \"key[:name][:maxWidth]\":\n"
+"\n"
+"    KEY: The (extended) config key to display\n"
+"\n"
+"    NAME: Name to display in the column header.\n"
+"    Defaults to the key if not specified or empty.\n"
+"\n"
+"    MAXWIDTH: Max width of the column (longer results are truncated).\n"
+"    Defaults to -1 (unlimited). Use 0 to limit to the column header size.\n"
+"\n"
+"*Examples*\n"
+"lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:"
+"MAC\n"
+"    Shows a list of containers using the \"NAME\", \"BASE IMAGE\", \"STATE"
+"\", \"IPV4\",\n"
+"    \"IPV6\" and \"MAC\" columns.\n"
+"\n"
+"    \"BASE IMAGE\" and \"MAC\" are custom columns generated from container "
+"configuration keys."
+msgstr ""
+
+#: lxc/manpage.go:20
+msgid ""
+"Usage: lxc manpage <directory>\n"
+"\n"
+"Generate all the LXD manpages."
+msgstr ""
+
+#: lxc/monitor.go:41
+msgid ""
+"Usage: lxc monitor [<remote>:] [--type=TYPE...]\n"
+"\n"
+"Monitor a local or remote LXD server.\n"
+"\n"
+"By default the monitor will listen to all message types.\n"
+"\n"
+"Message types to listen for can be specified with --type.\n"
+"\n"
+"*Examples*\n"
+"lxc monitor --type=logging\n"
+"    Only show log message."
+msgstr ""
+
+#: lxc/move.go:16
+msgid ""
+"Usage: lxc move [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
+"<snapshot>]]\n"
+"\n"
+"Move containers within or in between LXD instances.\n"
+"\n"
+"lxc move [<remote>:]<source container> [<remote>:][<destination container>]\n"
+"    Move a container between two hosts, renaming it if destination name "
+"differs.\n"
+"\n"
+"lxc move <old name> <new name>\n"
+"    Rename a local container.\n"
+"\n"
+"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"    Rename a snapshot."
+msgstr ""
+
+#: lxc/network.go:49
+msgid ""
+"Usage: lxc network <subcommand> [options]\n"
+"\n"
+"Manage and attach containers to networks.\n"
+"\n"
+"lxc network list [<remote>:]\n"
+"    List available networks.\n"
+"\n"
+"lxc network show [<remote>:]<network>\n"
+"    Show details of a network.\n"
+"\n"
+"lxc network create [<remote>:]<network> [key=value...]\n"
+"    Create a network.\n"
+"\n"
+"lxc network get [<remote>:]<network> <key>\n"
+"    Get network configuration.\n"
+"\n"
+"lxc network set [<remote>:]<network> <key> <value>\n"
+"    Set network configuration.\n"
+"\n"
+"lxc network unset [<remote>:]<network> <key>\n"
+"    Unset network configuration.\n"
+"\n"
+"lxc network delete [<remote>:]<network>\n"
+"    Delete a network.\n"
+"\n"
+"lxc network edit [<remote>:]<network>\n"
+"    Edit network, either by launching external editor or reading STDIN.\n"
+"\n"
+"lxc network attach [<remote>:]<network> <container> [device name] [interface "
+"name]\n"
+"    Attach a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name] "
+"[interface name]\n"
+"    Attach a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"container.\n"
+"\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]\n"
+"    Remove a network interface connecting the network to a specified "
+"profile.\n"
+"\n"
+"*Examples*\n"
+"cat network.yaml | lxc network edit <network>\n"
+"    Update a network using the content of network.yaml"
+msgstr ""
+
+#: lxc/profile.go:49
+msgid ""
+"Usage: lxc profile <subcommand> [options]\n"
+"\n"
+"Manage container configuration profiles.\n"
+"\n"
+"*Profile configuration*\n"
+"lxc profile list [<remote>:]\n"
+"    List available profiles.\n"
+"\n"
+"lxc profile show [<remote>:]<profile>\n"
+"    Show details of a profile.\n"
+"\n"
+"lxc profile create [<remote>:]<profile>\n"
+"    Create a profile.\n"
+"\n"
+"lxc profile copy [<remote>:]<profile> [<remote>:]<profile>\n"
+"    Copy the profile.\n"
+"\n"
+"lxc profile get [<remote>:]<profile> <key>\n"
+"    Get profile configuration.\n"
+"\n"
+"lxc profile set [<remote>:]<profile> <key> <value>\n"
+"    Set profile configuration.\n"
+"\n"
+"lxc profile unset [<remote>:]<profile> <key>\n"
+"    Unset profile configuration.\n"
+"\n"
+"lxc profile delete [<remote>:]<profile>\n"
+"    Delete a profile.\n"
+"\n"
+"lxc profile edit [<remote>:]<profile>\n"
+"    Edit profile, either by launching external editor or reading STDIN.\n"
+"\n"
+"*Profile assignment*\n"
+"lxc profile assign [<remote>:]<container> <profiles>\n"
+"    Replace the current set of profiles for the container by the one "
+"provided.\n"
+"\n"
+"lxc profile add [<remote>:]<container> <profile>\n"
+"    Add a profile to a container\n"
+"\n"
+"lxc profile remove [<remote>:]<container> <profile>\n"
+"    Remove the profile from a container\n"
+"\n"
+"*Device management*\n"
+"lxc profile device list [<remote>:]<profile>\n"
+"    List devices in the given profile.\n"
+"\n"
+"lxc profile device show [<remote>:]<profile>\n"
+"    Show full device details in the given profile.\n"
+"\n"
+"lxc profile device remove [<remote>:]<profile> <name>\n"
+"    Remove a device from a profile.\n"
+"\n"
+"lxc profile device get [<remote>:]<profile> <name> <key>\n"
+"    Get a device property.\n"
+"\n"
+"lxc profile device set [<remote>:]<profile> <name> <key> <value>\n"
+"    Set a device property.\n"
+"\n"
+"lxc profile device unset [<remote>:]<profile> <name> <key>\n"
+"    Unset a device property.\n"
+"\n"
+"lxc profile device add [<remote>:]<profile> <device> <type> [key=value...]\n"
+"    Add a profile device, such as a disk or a nic, to the containers using "
+"the specified profile.\n"
+"\n"
+"*Examples*\n"
+"cat profile.yaml | lxc profile edit <profile>\n"
+"    Update a profile using the content of profile.yaml\n"
+"\n"
+"lxc profile assign foo default,bar\n"
+"    Set the profiles for \"foo\" to \"default\" and \"bar\".\n"
+"\n"
+"lxc profile assign foo default\n"
+"    Reset \"foo\" to only using the \"default\" profile.\n"
+"\n"
+"lxc profile assign foo ''\n"
+"    Remove all profile from \"foo\""
+msgstr ""
+
+#: lxc/publish.go:27
+msgid ""
+"Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]\n"
+"\n"
+"Publish containers as images."
+msgstr ""
+
+#: lxc/remote.go:37
+msgid ""
+"Usage: lxc remote <subcommand> [options]\n"
+"\n"
+"Manage the list of remote LXD servers.\n"
+"\n"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
+"password=PASSWORD] [--public] [--protocol=PROTOCOL]\n"
+"    Add the remote <remote> at <url>.\n"
+"\n"
+"lxc remote remove <remote>\n"
+"    Remove the remote <remote>.\n"
+"\n"
+"lxc remote list\n"
+"    List all remotes.\n"
+"\n"
+"lxc remote rename <old name> <new name>\n"
+"    Rename remote <old name> to <new name>.\n"
+"\n"
+"lxc remote set-url <remote> <url>\n"
+"    Update <remote>'s url to <url>.\n"
+"\n"
+"lxc remote set-default <remote>\n"
+"    Set the default remote.\n"
+"\n"
+"lxc remote get-default\n"
+"    Print the default remote."
+msgstr ""
+
+#: lxc/restore.go:21
+msgid ""
+"Usage: lxc restore [<remote>:]<container> <snapshot> [--stateful]\n"
+"\n"
+"Restore containers from snapshots.\n"
+"\n"
+"If --stateful is passed, then the running state will be restored too.\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create the snapshot.\n"
+"\n"
+"lxc restore u1 snap0\n"
+"    Restore the snapshot."
+msgstr ""
+
+#: lxc/snapshot.go:21
+msgid ""
+"Usage: lxc snapshot [<remote>:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"Create container snapshots.\n"
+"\n"
+"When --stateful is used, LXD attempts to checkpoint the container's\n"
+"running state, including process memory state, TCP connections, ...\n"
+"\n"
+"*Examples*\n"
+"lxc snapshot u1 snap0\n"
+"    Create a snapshot of \"u1\" called \"snap0\"."
+msgstr ""
+
+#: lxc/storage.go:61
+msgid ""
+"Usage: lxc storage <subcommand> [options]\n"
+"\n"
+"Manage storage pools and volumes.\n"
+"\n"
+"*Storage pools*\n"
+"lxc storage list [<remote>:]\n"
+"    List available storage pools.\n"
+"\n"
+"lxc storage show [<remote>:]<pool>\n"
+"    Show details of a storage pool.\n"
+"\n"
+"lxc storage create [<remote>:]<pool> <driver> [key=value]...\n"
+"    Create a storage pool.\n"
+"\n"
+"lxc storage get [<remote>:]<pool> <key>\n"
+"    Get storage pool configuration.\n"
+"\n"
+"lxc storage set [<remote>:]<pool> <key> <value>\n"
+"    Set storage pool configuration.\n"
+"\n"
+"lxc storage unset [<remote>:]<pool> <key>\n"
+"    Unset storage pool configuration.\n"
+"\n"
+"lxc storage delete [<remote>:]<pool>\n"
+"    Delete a storage pool.\n"
+"\n"
+"lxc storage edit [<remote>:]<pool>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"*Storage volumes*\n"
+"lxc storage volume list [<remote>:]<pool>\n"
+"    List available storage volumes on a storage pool.\n"
+"\n"
+"lxc storage volume show [<remote>:]<pool> <volume>\n"
+"    Show details of a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume create [<remote>:]<pool> <volume> [key=value]...\n"
+"    Create a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume get [<remote>:]<pool> <volume> <key>\n"
+"    Get storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume set [<remote>:]<pool> <volume> <key> <value>\n"
+"    Set storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume unset [<remote>:]<pool> <volume> <key>\n"
+"    Unset storage volume configuration on a storage pool.\n"
+"\n"
+"lxc storage volume delete [<remote>:]<pool> <volume>\n"
+"    Delete a storage volume on a storage pool.\n"
+"\n"
+"lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Edit storage pool, either by launching external editor or reading "
+"STDIN.\n"
+"\n"
+"lxc storage volume attach [<remote>:]<pool> <volume> <container> [device "
+"name] <path>\n"
+"    Attach a storage volume to the specified container.\n"
+"\n"
+"lxc storage volume attach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name] <path>\n"
+"    Attach a storage volume to the specified profile.\n"
+"\n"
+"lxc storage volume detach [<remote>:]<pool> <volume> <container> [device "
+"name]\n"
+"    Detach a storage volume from the specified container.\n"
+"\n"
+"lxc storage volume detach-profile [<remote:>]<pool> <volume> <profile> "
+"[device name]\n"
+"    Detach a storage volume from the specified profile.\n"
+"\n"
+"Unless specified through a prefix, all volume operations affect \"custom"
+"\" (user created) volumes.\n"
+"\n"
+"*Examples*\n"
+"cat pool.yaml | lxc storage edit [<remote>:]<pool>\n"
+"    Update a storage pool using the content of pool.yaml.\n"
+"\n"
+"cat pool.yaml | lxc storage volume edit [<remote>:]<pool> <volume>\n"
+"    Update a storage volume using the content of pool.yaml.\n"
+"\n"
+"lxc storage volume show default data\n"
+"    Will show the properties of a custom volume called \"data\" in the "
+"\"default\" pool.\n"
+"\n"
+"lxc storage volume show default container/data\n"
+"    Will show the properties of the filesystem for a container called \"data"
+"\" in the \"default\" pool."
+msgstr ""
 
-#: lxc/image.go:300 lxc/image.go:589
+#: lxc/version.go:18
+msgid ""
+"Usage: lxc version\n"
+"\n"
+"Print the version number of this client tool."
+msgstr ""
+
+#: lxc/delete.go:45
+msgid "User aborted delete operation."
+msgstr ""
+
+#: lxc/restore.go:37
+msgid ""
+"Whether or not to restore the container's running state from snapshot (if "
+"available)"
+msgstr ""
+
+#: lxc/snapshot.go:35
+msgid "Whether or not to snapshot the container's running state"
+msgstr ""
+
+#: lxc/network.go:446 lxc/remote.go:370 lxc/remote.go:375
+msgid "YES"
+msgstr ""
+
+#: lxc/main.go:55
+msgid "`lxc config profile` is deprecated, please use `lxc profile`"
+msgstr ""
+
+#: lxc/launch.go:130
+msgid "bad number of things scanned from image, container or snapshot"
+msgstr ""
+
+#: lxc/action.go:94
+msgid "bad result type from action"
+msgstr ""
+
+#: lxc/copy.go:116
+msgid "can't copy to the same container name"
+msgstr ""
+
+#: lxc/file.go:316
+msgid "can't pull a directory without --recursive"
+msgstr ""
+
+#: lxc/remote.go:358
+msgid "can't remove the default remote"
+msgstr ""
+
+#: lxc/file.go:127
+msgid "can't supply uid/gid/mode in recursive mode"
+msgstr ""
+
+#: lxc/remote.go:384
+msgid "default"
+msgstr ""
+
+#: lxc/copy.go:132 lxc/copy.go:137 lxc/copy.go:233 lxc/copy.go:238
+#: lxc/init.go:234 lxc/init.go:239 lxc/launch.go:114 lxc/launch.go:119
+msgid "didn't get any affected image, container or snapshot from server"
+msgstr ""
+
+#: lxc/image.go:307
+msgid "disabled"
+msgstr ""
+
+#: lxc/image.go:309
+msgid "enabled"
+msgstr ""
+
+#: lxc/action.go:126 lxc/main.go:25 lxc/main.go:159
+#, c-format
+msgid "error: %v"
+msgstr ""
+
+#: lxc/help.go:37 lxc/main.go:106
+#, c-format
+msgid "error: unknown command: %s"
+msgstr ""
+
+#: lxc/launch.go:134
+msgid "got bad version"
+msgstr ""
+
+#: lxc/image.go:302 lxc/image.go:591
 msgid "no"
 msgstr ""
 
@@ -1757,48 +1901,48 @@ msgstr ""
 msgid "not all the profiles from the source exist on the target"
 msgstr ""
 
-#: lxc/remote.go:218
+#: lxc/remote.go:232
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:305 lxc/main.go:309
+#: lxc/main.go:331 lxc/main.go:335
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
 
-#: lxc/file.go:376
+#: lxc/file.go:383
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:406
+#: lxc/remote.go:420
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
+#: lxc/remote.go:350 lxc/remote.go:412 lxc/remote.go:447 lxc/remote.go:463
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:319
+#: lxc/remote.go:333
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
+#: lxc/remote.go:354 lxc/remote.go:416 lxc/remote.go:451
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
 
-#: lxc/info.go:219
+#: lxc/info.go:221
 msgid "stateful"
 msgstr ""
 
-#: lxc/info.go:221
+#: lxc/info.go:223
 msgid "stateless"
 msgstr ""
 
-#: lxc/info.go:215
+#: lxc/info.go:217
 #, c-format
 msgid "taken at %s"
 msgstr ""
@@ -1807,14 +1951,26 @@ msgstr ""
 msgid "unreachable return reached"
 msgstr ""
 
-#: lxc/main.go:237
+#: lxc/main.go:262
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:46 lxc/image.go:302 lxc/image.go:593
+#: lxc/delete.go:44 lxc/image.go:304 lxc/image.go:595
 msgid "yes"
 msgstr ""
 
 #: lxc/copy.go:45
 msgid "you must specify a source container name"
 msgstr ""
+
+#~ msgid "Available commands:"
+#~ msgstr "Доступные команды:"
+
+#~ msgid ""
+#~ "Check if the LXD instance is up.\n"
+#~ "\n"
+#~ "lxc finger [<remote>:]"
+#~ msgstr ""
+#~ "Проверьте, запущен ли экземпляр LXD.\n"
+#~ "\n"
+#~ "lxc finger [<remote>:]"


More information about the lxc-devel mailing list