[lxc-devel] [lxd/master] Update PO templates

stgraber on Github lxc-bot at linuxcontainers.org
Fri Dec 16 17:32:38 UTC 2016


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161216/ba9eed96/attachment.bin>
-------------- next part --------------
From 41a43c56ca96f72c36fe2dcc7c6b815a2ae55533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 16 Dec 2016 12:30:52 -0500
Subject: [PATCH] Update PO 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 |  655 +++++++++++++++++---------------
 po/fr.po | 1261 +++++++++++++++++++++++++++++---------------------------------
 po/ja.po |  791 ++++++++++++++++++++++-----------------
 3 files changed, 1376 insertions(+), 1331 deletions(-)

diff --git a/po/de.po b/po/de.po
index 811fcc9..f5b6c8a 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: 2016-11-04 21:31-0400\n"
+"POT-Creation-Date: 2016-12-15 13:20-0500\n"
 "PO-Revision-Date: 2015-06-13 06:10+0200\n"
 "Last-Translator: Felix Engelmann <felix-lxd at nlogn.org>\n"
 "Language-Team: \n"
@@ -165,7 +165,7 @@ msgstr ""
 "###\n"
 "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
 
-#: lxc/image.go:617
+#: lxc/image.go:614
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -175,15 +175,15 @@ msgstr ""
 msgid "'/' not allowed in snapshot name"
 msgstr "'/' ist kein gültiges Zeichen im Namen eines Sicherungspunktes\n"
 
-#: lxc/profile.go:254
+#: lxc/profile.go:253
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:638 lxc/image.go:680
+#: lxc/image.go:635 lxc/image.go:677
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:642
+#: lxc/image.go:639
 msgid "ARCH"
 msgstr ""
 
@@ -191,30 +191,26 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:52
+#: lxc/remote.go:51
 msgid "Accept certificate"
 msgstr "Akzeptiere Zertifikat"
 
-#: lxc/remote.go:268
+#: lxc/remote.go:267
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Administrator Passwort für %s: "
 
-#: lxc/image.go:365
+#: lxc/image.go:362
 #, fuzzy
 msgid "Aliases:"
 msgstr "Aliasse:\n"
 
-#: lxc/exec.go:54
-msgid "An environment variable of the form HOME=/home/foo"
-msgstr ""
-
-#: lxc/image.go:348 lxc/info.go:93
+#: lxc/image.go:345 lxc/info.go:93
 #, fuzzy, c-format
 msgid "Architecture: %s"
 msgstr "Architektur: %s\n"
 
-#: lxc/image.go:369
+#: lxc/image.go:366
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
@@ -253,11 +249,11 @@ msgstr ""
 msgid "Can't unset key '%s', it's not currently set."
 msgstr ""
 
-#: lxc/network.go:386 lxc/profile.go:420
+#: lxc/network.go:385 lxc/profile.go:419
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:218
+#: lxc/remote.go:217
 #, fuzzy, c-format
 msgid "Certificate fingerprint: %x"
 msgstr "Fingerabdruck des Zertifikats: % x\n"
@@ -265,15 +261,26 @@ msgstr "Fingerabdruck des Zertifikats: % x\n"
 #: lxc/action.go:33
 #, fuzzy, c-format
 msgid ""
-"Changes state of one or more containers to %s.\n"
+"Change state of one or more containers to %s.\n"
 "\n"
-"lxc %s <name> [<name>...]%s"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 msgstr ""
 "Ändert den Laufzustand eines Containers in %s.\n"
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/remote.go:291
+#: 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
 msgid "Client certificate stored at server: "
 msgstr "Gespeichertes Nutzerzertifikat auf dem Server: "
 
@@ -287,8 +294,8 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config.go:530 lxc/config.go:595 lxc/image.go:734 lxc/network.go:342
-#: lxc/profile.go:218
+#: lxc/config.go:530 lxc/config.go:595 lxc/image.go:731 lxc/network.go:341
+#: lxc/profile.go:217
 #, fuzzy, c-format
 msgid "Config parsing error: %s"
 msgstr "YAML Analyse Fehler %v\n"
@@ -301,7 +308,7 @@ msgstr ""
 msgid "Container name is mandatory"
 msgstr ""
 
-#: lxc/copy.go:140 lxc/copy.go:241 lxc/init.go:227
+#: lxc/copy.go:140 lxc/copy.go:241 lxc/init.go:229
 #, c-format
 msgid "Container name is: %s"
 msgstr ""
@@ -311,36 +318,41 @@ msgstr ""
 msgid "Container published with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:166
+#: lxc/image.go:165
 msgid "Copy aliases from source"
 msgstr "Kopiere Aliasse von der Quelle"
 
 #: lxc/copy.go:24
 #, fuzzy
 msgid ""
-"Copy containers within or in between lxd instances.\n"
+"Copy containers within or in between LXD instances.\n"
 "\n"
-"lxc copy [remote:]<source container> [[remote:]<destination container>] [--"
+"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:280
+#: lxc/image.go:278
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:233
+#: lxc/remote.go:232
 msgid "Could not create server cert dir"
 msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 
+#: lxc/file.go:83
+#, 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:]<source> <snapshot name> [--stateful]\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"
@@ -353,19 +365,19 @@ msgid ""
 "successfully).\n"
 "\n"
 "Example:\n"
-"lxc snapshot u1 snap0"
+"    lxc snapshot u1 snap0"
 msgstr ""
 
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:59 lxc/file.go:60
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:353 lxc/info.go:95
+#: lxc/image.go:350 lxc/info.go:95
 #, c-format
 msgid "Created: %s"
 msgstr ""
 
-#: lxc/init.go:180 lxc/launch.go:134
+#: lxc/init.go:180 lxc/launch.go:135
 #, c-format
 msgid "Creating %s"
 msgstr ""
@@ -375,7 +387,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/image.go:641 lxc/image.go:682
+#: lxc/image.go:638 lxc/image.go:679
 msgid "DESCRIPTION"
 msgstr ""
 
@@ -386,9 +398,9 @@ msgstr ""
 #: lxc/delete.go:25
 #, fuzzy
 msgid ""
-"Delete containers or container snapshots.\n"
+"Delete containers or snapshots.\n"
 "\n"
-"lxc delete [remote:]<container>[/<snapshot>] [remote:][<container>[/"
+"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
 "<snapshot>]...]\n"
 "\n"
 "Destroy containers or snapshots with any attached data (configuration, "
@@ -418,13 +430,19 @@ msgid "EXPIRY DATE"
 msgstr ""
 
 #: lxc/main.go:41
-msgid "Enables debug mode."
+#, fuzzy
+msgid "Enable debug mode"
 msgstr "Aktiviert Debug Modus"
 
 #: lxc/main.go:40
-msgid "Enables verbose mode."
+#, fuzzy
+msgid "Enable verbose mode"
 msgstr "Aktiviert ausführliche Ausgabe"
 
+#: lxc/exec.go:54
+msgid "Environment variable to set (e.g. HOME=/home/foo)"
+msgstr ""
+
 #: lxc/help.go:69
 msgid "Environment:"
 msgstr ""
@@ -443,8 +461,8 @@ msgstr ""
 msgid ""
 "Execute the specified command in a container.\n"
 "\n"
-"lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env "
-"EDITOR=/usr/bin/vim]... [--] <command line>\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)."
@@ -453,16 +471,16 @@ msgstr ""
 "\n"
 "lxc exec <Container> [--env EDITOR=/usr/bin/vim]... <Befehl>\n"
 
-#: lxc/image.go:357
+#: lxc/image.go:354
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:359
+#: lxc/image.go:356
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/config.go:272 lxc/image.go:639 lxc/image.go:681
+#: lxc/config.go:272 lxc/image.go:636 lxc/image.go:678
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -470,43 +488,44 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt"
 msgstr ""
 
-#: lxc/image.go:346
+#: lxc/image.go:343
 #, fuzzy, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerabdruck: %s\n"
 
-#: lxc/finger.go:15
-#, fuzzy
-msgid ""
-"Fingers the LXD instance to check if it is up and working.\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/action.go:42 lxc/action.go:43
-msgid "Force the container to shutdown."
+#, fuzzy
+msgid "Force the container to shutdown"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/delete.go:34 lxc/delete.go:35
-msgid "Force the removal of stopped containers."
+msgid "Force the removal of stopped containers"
 msgstr ""
 
 #: lxc/main.go:42
-msgid "Force using the local unix socket."
+msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/image.go:169 lxc/list.go:123
+#: lxc/image.go:168 lxc/list.go:123
 msgid "Format"
 msgstr ""
 
-#: lxc/remote.go:66
+#: lxc/remote.go:65
 #, 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:423
 msgid "IPV4"
 msgstr ""
@@ -525,24 +544,24 @@ msgid ""
 msgstr ""
 
 #: lxc/main.go:43
-msgid "Ignore aliases when determining what command to run."
+msgid "Ignore aliases when determining what command to run"
 msgstr ""
 
 #: lxc/action.go:46
 #, fuzzy
-msgid "Ignore the container state (only for start)."
+msgid "Ignore the container state (only for start)"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:285
+#: lxc/image.go:281
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:442
+#: lxc/image.go:421 lxc/image.go:433
 #, fuzzy, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:429
+#: lxc/image.go:418
 #, c-format
 msgid "Importing the image: %s"
 msgstr ""
@@ -552,8 +571,8 @@ msgstr ""
 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>]\n"
+"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
+"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>]\n"
 "\n"
 "Initializes a container using the specified image and name.\n"
 "\n"
@@ -561,7 +580,7 @@ msgid ""
 "Specifying \"-p\" with no argument will result in no profile.\n"
 "\n"
 "Example:\n"
-"lxc init ubuntu u1"
+"    lxc init ubuntu u1"
 msgstr ""
 "Starte Container von gegebenem Abbild.\n"
 "\n"
@@ -575,7 +594,7 @@ msgstr ""
 "Beispiel:\n"
 "lxc launch ubuntu u1\n"
 
-#: lxc/remote.go:136
+#: lxc/remote.go:135
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -589,12 +608,12 @@ msgstr "Akzeptiere Zertifikat"
 msgid "Invalid configuration key"
 msgstr ""
 
-#: lxc/file.go:247
+#: lxc/file.go:249
 #, c-format
 msgid "Invalid source %s"
 msgstr "Ungültige Quelle %s"
 
-#: lxc/file.go:73
+#: lxc/file.go:72
 #, c-format
 msgid "Invalid target %s"
 msgstr "Ungültiges Ziel %s"
@@ -603,7 +622,7 @@ msgstr "Ungültiges Ziel %s"
 msgid "Ips:"
 msgstr ""
 
-#: lxc/image.go:167
+#: lxc/image.go:166
 msgid "Keep the image up to date after initial copy"
 msgstr ""
 
@@ -620,8 +639,9 @@ msgstr ""
 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>]\n"
+"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>]\n"
 "\n"
 "Launches a container using the specified image and name.\n"
 "\n"
@@ -629,7 +649,7 @@ msgid ""
 "Specifying \"-p\" with no argument will result in no profile.\n"
 "\n"
 "Example:\n"
-"lxc launch ubuntu:16.04 u1"
+"    lxc launch ubuntu:16.04 u1"
 msgstr ""
 "Starte Container von gegebenem Abbild.\n"
 "\n"
@@ -649,10 +669,10 @@ msgid ""
 "List information on LXD servers and containers.\n"
 "\n"
 "For a container:\n"
-" lxc info [<remote>:]container [--show-log]\n"
+"    lxc info [<remote:>]<container> [--show-log]\n"
 "\n"
 "For a server:\n"
-" lxc info [<remote>:]"
+"    lxc info [<remote:>]"
 msgstr ""
 "Listet Informationen über Container.\n"
 "\n"
@@ -664,9 +684,10 @@ msgstr ""
 #: lxc/list.go:68
 #, fuzzy
 msgid ""
-"Lists the available resources.\n"
+"Lists the containers.\n"
 "\n"
-"lxc list [resource] [filters] [--format table|json] [-c columns] [--fast]\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 "
@@ -715,8 +736,9 @@ msgid ""
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
-"Example: lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile."
-"eth0.hwaddr:MAC\n"
+"Example:\n"
+"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
+"hwaddr:MAC"
 msgstr ""
 "Listet vorhandene Ressourcen.\n"
 "\n"
@@ -737,11 +759,11 @@ msgstr ""
 msgid "Log:"
 msgstr ""
 
-#: lxc/network.go:424
+#: lxc/network.go:423
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:165
+#: lxc/image.go:164
 msgid "Make image public"
 msgstr "Veröffentliche Abbild"
 
@@ -755,22 +777,29 @@ msgstr "Veröffentliche Abbild"
 msgid ""
 "Manage configuration profiles.\n"
 "\n"
-"lxc profile list [filters]                     List available profiles.\n"
-"lxc profile show <profile>                     Show details of a profile.\n"
-"lxc profile create <profile>                   Create a profile.\n"
-"lxc profile copy <profile> <remote>            Copy the profile to the "
-"specified remote.\n"
-"lxc profile get <profile> <key>                Get profile configuration.\n"
-"lxc profile set <profile> <key> <value>        Set profile configuration.\n"
-"lxc profile unset <profile> <key>              Unset profile configuration.\n"
-"lxc profile delete <profile>                   Delete a profile.\n"
-"lxc profile edit <profile>\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 <container> <profiles>\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 "
@@ -782,27 +811,27 @@ msgid ""
 "             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 <container> <profile> # add a profile to a container\n"
-"lxc profile remove <container> <profile> # remove the profile from a "
+"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 <profile>                                   List "
-"devices in the given profile.\n"
-"lxc profile device show <profile>                                   Show "
-"full device details in the given profile.\n"
-"lxc profile device remove <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 <profile name> <device name> <device type> "
-"[key=value]...\n"
-"    Add a profile device, such as a disk or a nic, to the containers\n"
-"    using the specified profile."
+"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 ""
 "Verwalte Konfigurationsprofile.\n"
 "\n"
@@ -843,51 +872,58 @@ msgstr ""
 msgid ""
 "Manage configuration.\n"
 "\n"
-"lxc config device add <[remote:]container> <name> <type> [key=value]...     "
-"Add a device to a container.\n"
-"lxc config device get <[remote:]container> <name> <key>                     "
-"Get a device property.\n"
-"lxc config device set <[remote:]container> <name> <key> <value>             "
-"Set a device property.\n"
-"lxc config device unset <[remote:]container> <name> <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"
+"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 <config> # read from config."
-"yaml\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"
+"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=/"
+"    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 = "
+"    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 "
@@ -930,26 +966,26 @@ msgstr ""
 "Um das Server Passwort zur authentifizierung zu setzen:\n"
 "\tlxc config set core.trust_password blah\n"
 
-#: lxc/file.go:35
+#: lxc/file.go:36
 #, fuzzy
 msgid ""
-"Manage files on a container.\n"
+"Manage files in a container.\n"
 "\n"
-"lxc file pull [-r|--recursive] <source> [<source>...] <target>\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> [<source>...] <target>\n"
-"lxc file edit <file>\n"
+"mode=MODE] <source path> [<source path>...] [<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"
-"\n"
 "To push /etc/hosts into the container foo:\n"
-"  lxc file push /etc/hosts foo/etc/hosts\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 .\n"
+"    lxc file pull foo/etc/hosts ."
 msgstr ""
 "Verwaltet Dateien in einem Container.\n"
 "\n"
@@ -964,44 +1000,49 @@ msgstr ""
 msgid ""
 "Manage networks.\n"
 "\n"
-"lxc network list                               List available networks.\n"
-"lxc network show <network>                     Show details of a network.\n"
-"lxc network create <network> [key=value]...    Create a network.\n"
-"lxc network get <network> <key>                Get network configuration.\n"
-"lxc network set <network> <key> <value>        Set network configuration.\n"
-"lxc network unset <network> <key>              Unset network configuration.\n"
-"lxc network delete <network>                   Delete a network.\n"
-"lxc network edit <network>\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 <network> <container> [device name]\n"
-"lxc network attach-profile <network> <profile> [device name]\n"
+"lxc network attach [<remote>:]<network> <container> [device name]\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name]\n"
 "\n"
-"lxc network detach <network> <container> [device name]\n"
-"lxc network detach-profile <network> <container> [device name]\n"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]"
 msgstr ""
 
-#: lxc/remote.go:38
+#: lxc/remote.go:37
 #, fuzzy
 msgid ""
 "Manage remote LXD servers.\n"
 "\n"
-"lxc remote add [<name>] <IP|FQDN|URL> [--accept-certificate] [--"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
 "password=PASSWORD]\n"
-"                                      [--public] [--protocol=PROTOCOL]      "
+"                                        [--public] [--protocol=PROTOCOL]    "
 "Add the remote <name> at <url>.\n"
-"lxc remote remove <name>                                                    "
+"lxc remote remove <remote>                                                  "
 "Remove the remote <name>.\n"
 "lxc remote list                                                             "
 "List all remotes.\n"
-"lxc remote rename <old> <new>                                               "
+"lxc remote rename <old name> <new name>                                     "
 "Rename remote <old> to <new>.\n"
-"lxc remote set-url <name> <url>                                             "
+"lxc remote set-url <remote> <url>                                           "
 "Update <name>'s url to <url>.\n"
-"lxc remote set-default <name>                                               "
+"lxc remote set-default <remote>                                             "
 "Set the default remote.\n"
 "lxc remote get-default                                                      "
 "Print the default remote."
@@ -1042,22 +1083,22 @@ msgid ""
 "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"
+"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"
+"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"
+"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"
+"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"
@@ -1069,31 +1110,31 @@ msgid ""
 "    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"
+"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"
+"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"
+"lxc image show [<remote>:]<image>\n"
 "    Yaml output of the user modifiable properties of an image.\n"
 "\n"
-"lxc image edit [remote:]<image>\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"
+"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"
+"lxc image alias delete [<remote>:]<alias>\n"
 "    Delete an alias.\n"
 "\n"
-"lxc image alias list [remote:] [filter]\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.\n"
+"image alias name."
 msgstr ""
 
 #: lxc/info.go:161
@@ -1112,7 +1153,7 @@ msgstr "Fehlende Zusammenfassung."
 msgid ""
 "Monitor activity on the LXD server.\n"
 "\n"
-"lxc monitor [remote:] [--type=TYPE...]\n"
+"lxc monitor [<remote>:] [--type=TYPE...]\n"
 "\n"
 "Connects to the monitoring interface of the specified LXD server.\n"
 "\n"
@@ -1120,14 +1161,14 @@ msgid ""
 "Specific types to listen to can be specified with --type.\n"
 "\n"
 "Example:\n"
-"lxc monitor --type=logging"
+"    lxc monitor --type=logging"
 msgstr ""
 
-#: lxc/network.go:216 lxc/network.go:265
+#: lxc/network.go:215 lxc/network.go:264
 msgid "More than one device matches, specify the device name."
 msgstr ""
 
-#: lxc/file.go:235
+#: lxc/file.go:237
 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"
@@ -1137,12 +1178,15 @@ msgstr ""
 msgid ""
 "Move containers within or in between lxd instances.\n"
 "\n"
-"lxc move [remote:]<source container> [remote:]<destination container>\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"
@@ -1153,11 +1197,11 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/list.go:428 lxc/network.go:422 lxc/profile.go:447 lxc/remote.go:381
+#: lxc/list.go:428 lxc/network.go:421 lxc/profile.go:446 lxc/remote.go:380
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:408 lxc/remote.go:355 lxc/remote.go:360
+#: lxc/network.go:407 lxc/remote.go:354 lxc/remote.go:359
 msgid "NO"
 msgstr ""
 
@@ -1166,12 +1210,12 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: lxc/network.go:190
+#: lxc/network.go:189
 #, fuzzy, c-format
 msgid "Network %s created"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/network.go:293
+#: lxc/network.go:292
 #, fuzzy, c-format
 msgid "Network %s deleted"
 msgstr "Profil %s gelöscht\n"
@@ -1180,7 +1224,7 @@ msgstr "Profil %s gelöscht\n"
 msgid "Network name"
 msgstr ""
 
-#: lxc/image.go:168 lxc/publish.go:34
+#: lxc/image.go:167 lxc/publish.go:34
 msgid "New alias to define at target"
 msgstr ""
 
@@ -1189,7 +1233,7 @@ msgstr ""
 msgid "No certificate provided to add"
 msgstr "Kein Zertifikat zum hinzufügen bereitgestellt"
 
-#: lxc/network.go:225 lxc/network.go:274
+#: lxc/network.go:224 lxc/network.go:273
 #, fuzzy
 msgid "No device found for this network"
 msgstr "Kein Zertifikat für diese Verbindung"
@@ -1198,11 +1242,11 @@ msgstr "Kein Zertifikat für diese Verbindung"
 msgid "No fingerprint specified."
 msgstr "Kein Fingerabdruck angegeben."
 
-#: lxc/remote.go:121
+#: lxc/remote.go:120
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:434
+#: lxc/image.go:424
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -1210,7 +1254,7 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: lxc/image.go:538
+#: lxc/image.go:535
 #, c-format
 msgid "Output is in %s"
 msgstr ""
@@ -1231,11 +1275,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:383
+#: lxc/remote.go:382
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:640 lxc/remote.go:384
+#: lxc/image.go:637 lxc/remote.go:383
 msgid "PUBLIC"
 msgstr ""
 
@@ -1249,12 +1293,12 @@ msgstr ""
 
 #: lxc/help.go:70
 #, fuzzy
-msgid "Path to an alternate client configuration directory."
+msgid "Path to an alternate client configuration directory"
 msgstr "Alternatives config Verzeichnis."
 
 #: lxc/help.go:71
 #, fuzzy
-msgid "Path to an alternate server directory."
+msgid "Path to an alternate server directory"
 msgstr "Alternatives config Verzeichnis."
 
 #: lxc/main.go:31
@@ -1266,39 +1310,28 @@ msgstr ""
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/help.go:25
-#, fuzzy
-msgid ""
-"Presents details on how to use LXD.\n"
-"\n"
-"lxd help [--all]"
-msgstr ""
-"Zeigt Details über die Benutzung von LXD an.\n"
-"\n"
-"lxd help [—all]\n"
-
-#: lxc/network.go:343 lxc/profile.go:219
+#: lxc/network.go:342 lxc/profile.go:218
 msgid "Press enter to open the editor again"
 msgstr ""
 
-#: lxc/config.go:531 lxc/config.go:596 lxc/image.go:735
+#: lxc/config.go:531 lxc/config.go:596 lxc/image.go:732
 msgid "Press enter to start the editor again"
 msgstr ""
 
+#: lxc/manpage.go:18
+msgid "Print all the subcommands help."
+msgstr ""
+
 #: lxc/help.go:65
-msgid "Print debug information."
+msgid "Print debug information"
 msgstr ""
 
 #: lxc/help.go:64
-msgid "Print less common commands."
+msgid "Print less common commands"
 msgstr ""
 
 #: lxc/help.go:66
-msgid "Print verbose information."
-msgstr ""
-
-#: lxc/manpage.go:18
-msgid "Prints all the subcommands help."
+msgid "Print verbose information"
 msgstr ""
 
 #: lxc/version.go:18
@@ -1317,22 +1350,22 @@ msgstr ""
 msgid "Processes: %d"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/profile.go:275
+#: lxc/profile.go:274
 #, fuzzy, c-format
 msgid "Profile %s added to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
 
-#: lxc/profile.go:170
+#: lxc/profile.go:169
 #, fuzzy, c-format
 msgid "Profile %s created"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/profile.go:240
+#: lxc/profile.go:239
 #, fuzzy, c-format
 msgid "Profile %s deleted"
 msgstr "Profil %s gelöscht\n"
 
-#: lxc/profile.go:306
+#: lxc/profile.go:305
 #, fuzzy, c-format
 msgid "Profile %s removed from %s"
 msgstr "Gerät %s wurde von %s entfernt\n"
@@ -1343,7 +1376,7 @@ msgstr "Gerät %s wurde von %s entfernt\n"
 msgid "Profile to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/profile.go:256
+#: lxc/profile.go:255
 #, fuzzy, c-format
 msgid "Profiles %s applied to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
@@ -1353,16 +1386,16 @@ msgstr "Profil %s wurde auf %s angewandt\n"
 msgid "Profiles: %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/image.go:361
+#: lxc/image.go:358
 #, fuzzy
 msgid "Properties:"
 msgstr "Eigenschaften:\n"
 
-#: lxc/remote.go:55
+#: lxc/remote.go:54
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:349
+#: lxc/image.go:346
 #, fuzzy, c-format
 msgid "Public: %s"
 msgstr "Öffentlich: %s\n"
@@ -1371,15 +1404,15 @@ msgstr "Öffentlich: %s\n"
 msgid ""
 "Publish containers as images.\n"
 "\n"
-"lxc publish [remote:]container [remote:] [--alias=ALIAS]... [prop-key=prop-"
-"value]..."
+"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]"
 msgstr ""
 
-#: lxc/file.go:58 lxc/file.go:59
+#: lxc/file.go:57 lxc/file.go:58
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/remote.go:53
+#: lxc/remote.go:52
 msgid "Remote admin password"
 msgstr "Entferntes Administrator Passwort"
 
@@ -1394,19 +1427,36 @@ msgid "Remove %s (yes/no): "
 msgstr ""
 
 #: lxc/delete.go:36 lxc/delete.go:37
-msgid "Require user confirmation."
+msgid "Require user confirmation"
 msgstr ""
 
 #: lxc/info.go:127
 msgid "Resources:"
 msgstr ""
 
-#: lxc/init.go:267
+#: 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/init.go:239
 #, c-format
 msgid "Retrieving image: %s"
 msgstr ""
 
-#: lxc/image.go:643
+#: lxc/image.go:640
 msgid "SIZE"
 msgstr ""
 
@@ -1418,46 +1468,32 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:385
+#: lxc/remote.go:384
 msgid "STATIC"
 msgstr ""
 
-#: lxc/remote.go:226
+#: lxc/remote.go:225
 msgid "Server certificate NACKed by user"
 msgstr "Server Zertifikat vom Benutzer nicht akzeptiert"
 
-#: lxc/remote.go:288
+#: lxc/remote.go:287
 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:54
+#: lxc/remote.go:53
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
-#: lxc/restore.go:21
-msgid ""
-"Set the current state of a resource back to a snapshot.\n"
-"\n"
-"lxc restore [remote:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
-"\n"
-"For example:\n"
-"lxc snapshot u1 snap0 # create the snapshot\n"
-"lxc restore u1 snap0 # restore the snapshot"
-msgstr ""
-
-#: lxc/file.go:56
+#: lxc/file.go:55
 msgid "Set the file's gid on push"
 msgstr "Setzt die gid der Datei beim Übertragen"
 
-#: lxc/file.go:57
+#: lxc/file.go:56
 msgid "Set the file's perms on push"
 msgstr "Setzt die Dateiberechtigungen beim Übertragen"
 
-#: lxc/file.go:55
+#: lxc/file.go:54
 msgid "Set the file's uid on push"
 msgstr "Setzt die uid der Datei beim Übertragen"
 
@@ -1466,14 +1502,18 @@ msgid "Show all commands (not just interesting ones)"
 msgstr "Zeigt alle Befehle (nicht nur die interessanten)"
 
 #: lxc/help.go:67
-msgid "Show client version."
+msgid "Show client version"
 msgstr ""
 
 #: lxc/info.go:36
 msgid "Show the container's last 100 log lines?"
 msgstr "Zeige die letzten 100 Zeilen Protokoll des Containers?"
 
-#: lxc/image.go:347
+#: lxc/config.go:32
+msgid "Show the expanded configuration"
+msgstr ""
+
+#: lxc/image.go:344
 #, fuzzy, c-format
 msgid "Size: %.2fMB"
 msgstr "Größe: %.2vMB\n"
@@ -1482,11 +1522,11 @@ msgstr "Größe: %.2vMB\n"
 msgid "Snapshots:"
 msgstr ""
 
-#: lxc/image.go:371
+#: lxc/image.go:368
 msgid "Source:"
 msgstr ""
 
-#: lxc/launch.go:142
+#: lxc/launch.go:144
 #, c-format
 msgid "Starting %s"
 msgstr ""
@@ -1506,7 +1546,7 @@ msgstr "Anhalten des Containers fehlgeschlagen!"
 
 #: lxc/action.go:45
 #, fuzzy
-msgid "Store the container state (only for stop)."
+msgid "Store the container state (only for stop)"
 msgstr "Herunterfahren des Containers erzwingen."
 
 #: lxc/info.go:169
@@ -1517,7 +1557,7 @@ msgstr ""
 msgid "Swap (peak)"
 msgstr ""
 
-#: lxc/list.go:433 lxc/network.go:423
+#: lxc/list.go:433 lxc/network.go:422
 msgid "TYPE"
 msgstr ""
 
@@ -1531,8 +1571,8 @@ msgid ""
 "restarted."
 msgstr ""
 
-#: lxc/init.go:313
-msgid "The container you are starting doesn’t have any network attached to it."
+#: lxc/init.go:312
+msgid "The container you are starting doesn't have any network attached to it."
 msgstr ""
 
 #: lxc/config.go:675 lxc/config.go:687 lxc/config.go:720 lxc/config.go:738
@@ -1541,7 +1581,7 @@ msgstr ""
 msgid "The device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/init.go:297
+#: lxc/init.go:296
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -1550,12 +1590,12 @@ msgstr ""
 msgid "The opposite of `lxc pause` is `lxc start`."
 msgstr ""
 
-#: lxc/network.go:230 lxc/network.go:279
+#: lxc/network.go:229 lxc/network.go:278
 #, fuzzy
 msgid "The specified device doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/network.go:234 lxc/network.go:283
+#: lxc/network.go:233 lxc/network.go:282
 #, fuzzy
 msgid "The specified device doesn't match the network"
 msgstr "entfernte Instanz %s existiert nicht"
@@ -1565,19 +1605,20 @@ msgid "There is no \"image name\".  Did you want an alias?"
 msgstr ""
 
 #: lxc/action.go:41
-msgid "Time to wait for the container before killing it."
+#, fuzzy
+msgid "Time to wait for the container before killing it"
 msgstr "Wartezeit bevor der Container gestoppt wird."
 
-#: lxc/image.go:350
+#: lxc/image.go:347
 #, fuzzy
 msgid "Timestamps:"
 msgstr "Zeitstempel:\n"
 
-#: lxc/init.go:315
+#: lxc/init.go:314
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr ""
 
-#: lxc/init.go:314
+#: lxc/init.go:313
 msgid "To create a new network, use: lxc network create"
 msgstr ""
 
@@ -1585,12 +1626,12 @@ msgstr ""
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
 msgstr ""
 
-#: lxc/image.go:421
+#: lxc/image.go:426
 #, c-format
-msgid "Transferring image: %d%%"
+msgid "Transferring image: %s"
 msgstr ""
 
-#: lxc/action.go:99 lxc/launch.go:155
+#: lxc/action.go:99 lxc/launch.go:157
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr ""
@@ -1603,23 +1644,23 @@ msgstr ""
 msgid "Type: persistent"
 msgstr ""
 
-#: lxc/image.go:644
+#: lxc/image.go:641
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:382
+#: lxc/remote.go:381
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:425 lxc/profile.go:448
+#: lxc/network.go:424 lxc/profile.go:447
 msgid "USED BY"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
-#: lxc/image.go:355
+#: lxc/image.go:352
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1635,7 +1676,7 @@ msgstr ""
 
 #: lxc/help.go:48
 #, fuzzy
-msgid "Usage: lxc [subcommand] [options]"
+msgid "Usage: lxc <command> [options]"
 msgstr ""
 "Benutzung: lxc [Unterbefehl] [Optionen]\n"
 "Verfügbare Befehle:\n"
@@ -1644,7 +1685,7 @@ msgstr ""
 msgid "User aborted delete operation."
 msgstr ""
 
-#: lxc/restore.go:35
+#: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
 "available)"
@@ -1656,11 +1697,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr "Zustand des laufenden Containers sichern oder nicht"
 
-#: lxc/config.go:32
-msgid "Whether to show the expanded configuration"
-msgstr ""
-
-#: lxc/network.go:410 lxc/remote.go:357 lxc/remote.go:362
+#: lxc/network.go:409 lxc/remote.go:356 lxc/remote.go:361
 msgid "YES"
 msgstr ""
 
@@ -1668,7 +1705,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/launch.go:127
+#: lxc/launch.go:128
 msgid "bad number of things scanned from image, container or snapshot"
 msgstr ""
 "Falsche Anzahl an Objekten im Abbild, Container oder Sicherungspunkt gelesen."
@@ -1681,32 +1718,32 @@ msgstr ""
 msgid "can't copy to the same container name"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/file.go:270
+#: lxc/file.go:272
 msgid "can't pull a directory without --recursive"
 msgstr ""
 
-#: lxc/remote.go:345
+#: lxc/remote.go:344
 msgid "can't remove the default remote"
 msgstr ""
 
-#: lxc/file.go:117
+#: lxc/file.go:119
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:371
+#: lxc/remote.go:370
 msgid "default"
 msgstr ""
 
 #: lxc/copy.go:131 lxc/copy.go:136 lxc/copy.go:232 lxc/copy.go:237
-#: lxc/init.go:217 lxc/init.go:222 lxc/launch.go:111 lxc/launch.go:116
+#: lxc/init.go:219 lxc/init.go:224 lxc/launch.go:112 lxc/launch.go:117
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:341
+#: lxc/image.go:338
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:343
+#: lxc/image.go:340
 msgid "enabled"
 msgstr ""
 
@@ -1720,11 +1757,11 @@ msgstr "Fehler: %v\n"
 msgid "error: unknown command: %s"
 msgstr "Fehler: unbekannter Befehl: %s\n"
 
-#: lxc/launch.go:131
+#: lxc/launch.go:132
 msgid "got bad version"
 msgstr "Versionskonflikt"
 
-#: lxc/image.go:336 lxc/image.go:620
+#: lxc/image.go:333 lxc/image.go:617
 msgid "no"
 msgstr ""
 
@@ -1732,7 +1769,7 @@ 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:219
+#: lxc/remote.go:218
 #, fuzzy
 msgid "ok (y/n)?"
 msgstr "OK (y/n)? "
@@ -1742,26 +1779,26 @@ msgstr "OK (y/n)? "
 msgid "processing aliases failed %s\n"
 msgstr ""
 
-#: lxc/file.go:311
+#: lxc/file.go:313
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:407
+#: lxc/remote.go:406
 #, c-format
 msgid "remote %s already exists"
 msgstr "entfernte Instanz %s existiert bereits"
 
-#: lxc/remote.go:337 lxc/remote.go:399 lxc/remote.go:434 lxc/remote.go:450
+#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/remote.go:320
+#: lxc/remote.go:319
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "entfernte Instanz %s existiert als <%s>"
 
-#: lxc/remote.go:341 lxc/remote.go:403 lxc/remote.go:438
+#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -1787,7 +1824,7 @@ msgstr ""
 msgid "wrong number of subcommand arguments"
 msgstr "falsche Anzahl an Parametern für Unterbefehl"
 
-#: lxc/delete.go:45 lxc/image.go:338 lxc/image.go:624
+#: lxc/delete.go:45 lxc/image.go:335 lxc/image.go:621
 msgid "yes"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index ddf6586..4ba34ad 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: 2016-11-04 21:31-0400\n"
+"POT-Creation-Date: 2016-12-15 13:20-0500\n"
 "PO-Revision-Date: 2016-12-16 14:08+0100\n"
 "Last-Translator: Stéphane Graber <stgraber at ubuntu.com\n"
 "Language-Team: French <fr at li.org>\n"
@@ -160,25 +160,24 @@ msgstr ""
 "###\n"
 "### Notez que le nom est affiché mais ne peut être modifié"
 
-#: lxc/image.go:617
+#: lxc/image.go:614
 #, c-format
 msgid "%s (%d more)"
 msgstr "%s (%d de plus)"
 
 #: lxc/snapshot.go:61
-#, fuzzy
 msgid "'/' not allowed in snapshot name"
 msgstr "'/' n'est pas autorisé dans le nom d'un instantané"
 
-#: lxc/profile.go:254
+#: lxc/profile.go:253
 msgid "(none)"
 msgstr "(aucun)"
 
-#: lxc/image.go:638 lxc/image.go:680
+#: lxc/image.go:635 lxc/image.go:677
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:642
+#: lxc/image.go:639
 msgid "ARCH"
 msgstr ""
 
@@ -186,29 +185,25 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:52
+#: lxc/remote.go:51
 msgid "Accept certificate"
 msgstr "Accepter le certificat"
 
-#: lxc/remote.go:268
+#: lxc/remote.go:267
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Mot de passe administrateur pour %s : "
 
-#: lxc/image.go:365
+#: lxc/image.go:362
 msgid "Aliases:"
 msgstr "Alias :"
 
-#: lxc/exec.go:54
-msgid "An environment variable of the form HOME=/home/foo"
-msgstr "Une variable d'environnement de la forme HOME=/home/foo"
-
-#: lxc/image.go:348 lxc/info.go:93
+#: lxc/image.go:345 lxc/info.go:93
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architecture : %s"
 
-#: lxc/image.go:369
+#: lxc/image.go:366
 #, c-format
 msgid "Auto update: %s"
 msgstr "Mise à jour auto. : %s"
@@ -245,29 +240,40 @@ msgstr "Impossible de lire depuis stdin : %s"
 #: lxc/config.go:126 lxc/config.go:159 lxc/config.go:181
 #, 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."
+msgstr ""
+"Impossible de désaffecter la clé '%s', elle n'est pas définie actuellement."
 
-#: lxc/network.go:386 lxc/profile.go:420
+#: lxc/network.go:385 lxc/profile.go:419
 msgid "Cannot provide container name to list"
 msgstr "Impossible de fournir le nom du conteneur à lister"
 
-#: lxc/remote.go:218
-#, fuzzy, c-format
+#: lxc/remote.go:217
+#, c-format
 msgid "Certificate fingerprint: %x"
 msgstr "Empreinte du certificat : %x"
 
 #: lxc/action.go:33
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Changes state of one or more containers to %s.\n"
+"Change state of one or more containers to %s.\n"
 "\n"
-"lxc %s <name> [<name>...]%s"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 msgstr ""
 "Change l'état d'un ou plusieurs conteneurs à %s.\n"
 "\n"
-"lxc %s <name> [<name>...]%s"
+"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 ""
+"Contacte LXD pour vérifier qu'il est actif et fonctionel.\n"
+"\n"
+"lxc finger [<remote>:]"
 
-#: lxc/remote.go:291
+#: lxc/remote.go:290
 msgid "Client certificate stored at server: "
 msgstr "Certificat client enregistré sur le serveur : "
 
@@ -280,9 +286,9 @@ msgstr "Colonnes"
 msgid "Config key/value to apply to the new container"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
-#: lxc/config.go:530 lxc/config.go:595 lxc/image.go:734 lxc/network.go:342
-#: lxc/profile.go:218
-#, fuzzy, c-format
+#: lxc/config.go:530 lxc/config.go:595 lxc/image.go:731 lxc/network.go:341
+#: lxc/profile.go:217
+#, c-format
 msgid "Config parsing error: %s"
 msgstr "Erreur lors de la lecture de la configuration : %s"
 
@@ -294,45 +300,51 @@ msgstr "Connexion refusée ; LXD est-il actif ?"
 msgid "Container name is mandatory"
 msgstr "Le nom du conteneur est obligatoire"
 
-#: lxc/copy.go:140 lxc/copy.go:241 lxc/init.go:227
+#: lxc/copy.go:140 lxc/copy.go:241 lxc/init.go:229
 #, c-format
 msgid "Container name is: %s"
 msgstr "Le nom du conteneur est : %s"
 
 #: lxc/publish.go:151 lxc/publish.go:166
-#, fuzzy, c-format
+#, c-format
 msgid "Container published with fingerprint: %s"
 msgstr "Conteneur publié avec l'empreinte : %s"
 
-#: lxc/image.go:166
+#: lxc/image.go:165
 msgid "Copy aliases from source"
 msgstr "Copier les alias depuis la source"
 
 #: lxc/copy.go:24
 msgid ""
-"Copy containers within or in between lxd instances.\n"
+"Copy containers within or in between LXD instances.\n"
 "\n"
-"lxc copy [remote:]<source container> [[remote:]<destination container>] [--"
+"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"
+"Copier les conteneurs dans ou depuis les instances LXD.\n"
 "\n"
-"lxc copy [remote:]<source container> [[remote:]<destination container>] [--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>...]"
 
-#: lxc/image.go:280
+#: lxc/image.go:278
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Copier l'image : %s"
 
-#: lxc/remote.go:233
+#: lxc/remote.go:232
 msgid "Could not create server cert dir"
 msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 
+#: lxc/file.go:83
+#, 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:]<source> <snapshot name> [--stateful]\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"
@@ -345,11 +357,11 @@ msgid ""
 "successfully).\n"
 "\n"
 "Example:\n"
-"lxc snapshot u1 snap0"
+"    lxc snapshot u1 snap0"
 msgstr ""
 "Créer un instantané en lecture seule d'un conteneur.\n"
 "\n"
-"lxc snapshot [remote:]<source> <snapshot name> [--stateful]\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"
@@ -361,18 +373,18 @@ msgstr ""
 "restaurées avec succès).\n"
 "\n"
 "Exemple :\n"
-"lxc snapshot u1 snap0"
+"    lxc snapshot u1 snap0"
 
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:59 lxc/file.go:60
 msgid "Create any directories necessary"
 msgstr "Créer tout répertoire nécessaire"
 
-#: lxc/image.go:353 lxc/info.go:95
+#: lxc/image.go:350 lxc/info.go:95
 #, c-format
 msgid "Created: %s"
 msgstr "Créé : %s"
 
-#: lxc/init.go:180 lxc/launch.go:134
+#: lxc/init.go:180 lxc/launch.go:135
 #, c-format
 msgid "Creating %s"
 msgstr "Création de %s"
@@ -381,7 +393,7 @@ msgstr "Création de %s"
 msgid "Creating the container"
 msgstr "Création du conteneur"
 
-#: lxc/image.go:641 lxc/image.go:682
+#: lxc/image.go:638 lxc/image.go:679
 msgid "DESCRIPTION"
 msgstr ""
 
@@ -391,9 +403,9 @@ msgstr "Définir un algorithme de compression : pour image ou aucun"
 
 #: lxc/delete.go:25
 msgid ""
-"Delete containers or container snapshots.\n"
+"Delete containers or snapshots.\n"
 "\n"
-"lxc delete [remote:]<container>[/<snapshot>] [remote:][<container>[/"
+"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
 "<snapshot>]...]\n"
 "\n"
 "Destroy containers or snapshots with any attached data (configuration, "
@@ -401,7 +413,7 @@ msgid ""
 msgstr ""
 "Supprimer des conteneurs ou des instantanés de conteneur.\n"
 "\n"
-"lxc delete [remote:]<container>[/<snapshot>] [remote:][<container>[/\n"
+"lxc delete [<remote>:]<container>[/<snapshot>] [<remote>:][<container>[/"
 "<snapshot>]...]\n"
 "\n"
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée\n"
@@ -426,12 +438,16 @@ msgid "EXPIRY DATE"
 msgstr "DATE D'EXPIRATION"
 
 #: lxc/main.go:41
-msgid "Enables debug mode."
-msgstr "Active le mode de débogage."
+msgid "Enable debug mode"
+msgstr "Active le mode de débogage"
 
 #: lxc/main.go:40
-msgid "Enables verbose mode."
-msgstr "Active le mode verbeux."
+msgid "Enable verbose mode"
+msgstr "Active le mode verbeux"
+
+#: lxc/exec.go:54
+msgid "Environment variable to set (e.g. HOME=/home/foo)"
+msgstr "Une variable d'environnement (de la forme HOME=/home/foo)"
 
 #: lxc/help.go:69
 msgid "Environment:"
@@ -447,34 +463,34 @@ msgid "Event type to listen for"
 msgstr "Type d'évènements à surveiller"
 
 #: lxc/exec.go:45
-#, fuzzy
 msgid ""
 "Execute the specified command in a container.\n"
 "\n"
-"lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env "
-"EDITOR=/usr/bin/vim]... [--] <command line>\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écute la commande spécifiée dans un conteneur.\n"
 "\n"
-"lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env EDITOR=/usr/bin/vim]... [--] <command line>\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:357
+#: lxc/image.go:354
 #, c-format
 msgid "Expires: %s"
 msgstr "Expire : %s"
 
-#: lxc/image.go:359
+#: lxc/image.go:356
 msgid "Expires: never"
 msgstr "N'expire jamais"
 
-#: lxc/config.go:272 lxc/image.go:639 lxc/image.go:681
+#: lxc/config.go:272 lxc/image.go:636 lxc/image.go:678
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
@@ -482,43 +498,41 @@ msgstr "EMPREINTE"
 msgid "Fast mode (same as --columns=nsacPt"
 msgstr "Mode rapide (identique à --columns=nsacPt"
 
-#: lxc/image.go:346
-#, fuzzy, c-format
+#: lxc/image.go:343
+#, c-format
 msgid "Fingerprint: %s"
 msgstr "Empreinte : %s"
 
-#: lxc/finger.go:15
-#, fuzzy
-msgid ""
-"Fingers the LXD instance to check if it is up and working.\n"
-"\n"
-"lxc finger <remote>"
-msgstr ""
-"Contacte LXD pour vérifier qu'il est actif et fonctionel.\n"
-"\n"
-"lxc finger <remote>"
-
 #: lxc/action.go:42 lxc/action.go:43
-msgid "Force the container to shutdown."
-msgstr "Force le conteneur à s'arrêter."
+msgid "Force the container to shutdown"
+msgstr "Force le conteneur à s'arrêter"
 
 #: lxc/delete.go:34 lxc/delete.go:35
-msgid "Force the removal of stopped containers."
-msgstr "Force la suppression des conteneurs arrêtés."
+msgid "Force the removal of stopped containers"
+msgstr "Force la suppression des conteneurs arrêtés"
 
 #: lxc/main.go:42
-msgid "Force using the local unix socket."
-msgstr "Force l'utilisation de la socket unix locale."
+msgid "Force using the local unix socket"
+msgstr "Force l'utilisation de la socket unix locale"
 
-#: lxc/image.go:169 lxc/list.go:123
+#: lxc/image.go:168 lxc/list.go:123
 msgid "Format"
 msgstr ""
 
-#: lxc/remote.go:66
-#, fuzzy
+#: lxc/remote.go:65
 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 ""
+"Explique comment utiliser LXD.\n"
+"\n"
+"lxc help [--all]"
+
 #: lxc/list.go:423
 msgid "IPV4"
 msgstr ""
@@ -534,27 +548,28 @@ msgstr "DATE D'ÉMISSION"
 #: lxc/main.go:136
 msgid ""
 "If this is your first time using LXD, you should also run: sudo lxd init"
-msgstr "Si c'est la première fois que vous lancez LXD, vous devriez aussi lancer : sudo 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
-msgid "Ignore aliases when determining what command to run."
-msgstr "Ignorer les alias pour déterminer la commande à exécuter."
+msgid "Ignore aliases when determining what command to run"
+msgstr "Ignorer les alias pour déterminer la commande à exécuter"
 
 #: lxc/action.go:46
-#, fuzzy
-msgid "Ignore the container state (only for start)."
-msgstr "Ignorer l'état du conteneur (seulement pour start)."
+msgid "Ignore the container state (only for start)"
+msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/image.go:285
+#: lxc/image.go:281
 msgid "Image copied successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:442
-#, fuzzy, c-format
+#: lxc/image.go:421 lxc/image.go:433
+#, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Image importée avec l'empreinte : %s"
 
-#: lxc/image.go:429
+#: lxc/image.go:418
 #, c-format
 msgid "Importing the image: %s"
 msgstr "Importation de l'image : %s"
@@ -563,8 +578,8 @@ msgstr "Importation de l'image : %s"
 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>]\n"
+"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
+"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>]\n"
 "\n"
 "Initializes a container using the specified image and name.\n"
 "\n"
@@ -572,11 +587,12 @@ msgid ""
 "Specifying \"-p\" with no argument will result in no profile.\n"
 "\n"
 "Example:\n"
-"lxc init ubuntu u1"
+"    lxc init ubuntu 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"
+"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 spécifiés.\n"
 "\n"
@@ -584,29 +600,27 @@ msgstr ""
 "Spécifier \\-p\\ sans argument résultera en aucun profil.\n"
 "\n"
 "Exemple :\n"
-"lxc init ubuntu u1"
+"    lxc init ubuntu u1"
 
-#: lxc/remote.go:136
+#: lxc/remote.go:135
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr "Schème d'URL invalide \"%s\" in \"%s\""
 
 #: lxc/config.go:253
-#, fuzzy
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
 #: lxc/init.go:30 lxc/init.go:35
-#, fuzzy
 msgid "Invalid configuration key"
 msgstr "Clé de configuration invalide"
 
-#: lxc/file.go:247
+#: lxc/file.go:249
 #, c-format
 msgid "Invalid source %s"
 msgstr "Source invalide %s"
 
-#: lxc/file.go:73
+#: lxc/file.go:72
 #, c-format
 msgid "Invalid target %s"
 msgstr "Cible invalide %s"
@@ -615,7 +629,7 @@ msgstr "Cible invalide %s"
 msgid "Ips:"
 msgstr "Ips :"
 
-#: lxc/image.go:167
+#: lxc/image.go:166
 msgid "Keep the image up to date after initial copy"
 msgstr "Garder l'image à jour après la copie initiale"
 
@@ -631,8 +645,9 @@ msgstr "Socket LXD introuvable ; LXD est-il installé et actif ?"
 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>]\n"
+"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>]\n"
 "\n"
 "Launches a container using the specified image and name.\n"
 "\n"
@@ -640,11 +655,13 @@ msgid ""
 "Specifying \"-p\" with no argument will result in no profile.\n"
 "\n"
 "Example:\n"
-"lxc launch ubuntu:16.04 u1"
+"    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"
+"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 spécifiés.\n"
 "\n"
@@ -652,31 +669,32 @@ msgstr ""
 "Spécifier \\\\-p\\\\ sans argument résultera en aucun profil.\n"
 "\n"
 "Exemple :\n"
-"lxc launch ubuntu:16.04 u1"
+"    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"
+"    lxc info [<remote:>]<container> [--show-log]\n"
 "\n"
 "For a server:\n"
-" lxc info [<remote>:]"
+"    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"
+"    lxc info [<remote>:]<container> [--show-log]\n"
 "\n"
 "Pour un serveur :\n"
-" lxc info [<remote>:]"
+"    lxc info [<remote>:]"
 
 #: lxc/list.go:68
 msgid ""
-"Lists the available resources.\n"
+"Lists the containers.\n"
 "\n"
-"lxc list [resource] [filters] [--format table|json] [-c columns] [--fast]\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 "
@@ -725,12 +743,14 @@ msgid ""
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
-"Example: lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile."
-"eth0.hwaddr:MAC\n"
+"Example:\n"
+"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
+"hwaddr:MAC"
 msgstr ""
 "Lister les ressources disponibles.\n"
 "\n"
-"lxc list [resource] [filters] [--format table|json] [-c columns] [--fast]\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\n"
@@ -783,17 +803,19 @@ msgstr ""
 "Colonnes par défaut : ns46tS\n"
 "Colonnes en mode rapide : nsacPt\n"
 "\n"
-"Exemple : lxc list -c n,volatile.base_image:\\BASE IMAGE\\:0,s46,volatile.eth0.hwaddr:MAC"
+"Exemple :\n"
+"    lxc list -c n,volatile.base_image:\\BASE IMAGE\\:0,s46,volatile.eth0."
+"hwaddr:MAC"
 
 #: lxc/info.go:239
 msgid "Log:"
 msgstr "Journal : "
 
-#: lxc/network.go:424
+#: lxc/network.go:423
 msgid "MANAGED"
 msgstr "GÉRÉ"
 
-#: lxc/image.go:165
+#: lxc/image.go:164
 msgid "Make image public"
 msgstr "Rendre l'image publique"
 
@@ -805,22 +827,29 @@ msgstr "Rendre l'image publique"
 msgid ""
 "Manage configuration profiles.\n"
 "\n"
-"lxc profile list [filters]                     List available profiles.\n"
-"lxc profile show <profile>                     Show details of a profile.\n"
-"lxc profile create <profile>                   Create a profile.\n"
-"lxc profile copy <profile> <remote>            Copy the profile to the "
-"specified remote.\n"
-"lxc profile get <profile> <key>                Get profile configuration.\n"
-"lxc profile set <profile> <key> <value>        Set profile configuration.\n"
-"lxc profile unset <profile> <key>              Unset profile configuration.\n"
-"lxc profile delete <profile>                   Delete a profile.\n"
-"lxc profile edit <profile>\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 <container> <profiles>\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 "
@@ -832,45 +861,54 @@ msgid ""
 "             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 <container> <profile> # add a profile to a container\n"
-"lxc profile remove <container> <profile> # remove the profile from a "
+"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 <profile>                                   List "
-"devices in the given profile.\n"
-"lxc profile device show <profile>                                   Show "
-"full device details in the given profile.\n"
-"lxc profile device remove <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 <profile name> <device name> <device type> "
-"[key=value]...\n"
-"    Add a profile device, such as a disk or a nic, to the containers\n"
-"    using the specified profile."
+"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 ""
 "Gérer les profils de configuration.\n"
 "\n"
-"lxc profile list [filters]                     List\n"
-"lxc profile list [filters]                     Lister les profils disponibles.\n"
-"lxc profile show <profile>                     Afficher les détails d'un profil.\n"
-"lxc profile create <profile>                   Créer un profil.\n"
-"lxc profile copy <profile> <remote>            Copier un profil vers la cible spécifiée.\n"
-"lxc profile get <profile> <key>                Obtenir une clé de la configuration du profil.\n"
-"lxc profile set <profile> <key> <value>        Positionner une clé de la configuration du profil.\n"
-"lxc profile unset <profile> <key>              Désaffecter une clé de la configuration du profil.\n"
-"lxc profile delete <profile>                   Supprimer un profil.\n"
-"lxc profile edit <profile>\n"
-"    Editer le profil, soit en lançant un éditeur externe ou en lisant STDIN.\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"
+"              cat profile.yaml | lxc profile edit <profile> # lire depuis "
+"profile.yaml\n"
 "\n"
-"lxc profile assign <container> <profiles>\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 spécifié.  Tous les profils fournis dans\n"
 "    cet appel (et seulement ceux-ci) seront appliqués au conteneur\n"
@@ -882,18 +920,25 @@ msgstr ""
 "              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 <container> <profile> # Ajouter un profil à un conteneur\n"
-"lxc profile remove <container> <profile> # Supprimer le profil d'un conteneur\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 <profile>                                   List \"\n"
-"lxc profile device list <profile>                                   Lister les périphériques d'un profil particulier.\n"
-"lxc profile device show <profile>                                   Afficher le détail des périphériques d'un profil donné.\n"
-"lxc profile device remove <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 <profile name> <device name> <device type> [key=value]...\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 spécifié."
 
@@ -901,51 +946,58 @@ msgstr ""
 msgid ""
 "Manage configuration.\n"
 "\n"
-"lxc config device add <[remote:]container> <name> <type> [key=value]...     "
-"Add a device to a container.\n"
-"lxc config device get <[remote:]container> <name> <key>                     "
-"Get a device property.\n"
-"lxc config device set <[remote:]container> <name> <key> <value>             "
-"Set a device property.\n"
-"lxc config device unset <[remote:]container> <name> <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"
+"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 <config> # read from config."
-"yaml\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"
+"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=/"
+"    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 = "
+"    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 "
@@ -957,67 +1009,91 @@ msgid ""
 msgstr ""
 "Gérer la configuration.\n"
 "\n"
-"lxc config device add <[remote:]container> <name> <type> [key=value]...     Ajouter un périphérique à un conteneur.\n"
-"lxc config device get <[remote:]container> <name> <key>                     Obtenir la propriété d'un périphérique.\n"
-"lxc config device set <[remote:]container> <name> <key> <value>             Positionner la propriété d'un périphérique.\n"
-"lxc config device unset <[remote:]container> <name> <key>                   Désaffecter la propriété d'un périphérique.\n"
-"lxc config device list <[remote:]container>                                 Lister les périphériques d'un conteneur.\n"
-"lxc config device show <[remote:]container>                                 Afficher les détails des périphériques d'un conteneur.\n"
-"lxc config device remove <[remote:]container> <name>                        Supprimer les périphériques d'un conteneur.\n"
-"\n"
-"lxc config get [remote:][container] <key>                                   Obtenir une clé de configuration d'un conteneur ou d'un serveur.\n"
-"lxc config set [remote:][container] <key> <value>                           Positionner une clé de configuration d'un conteneur ou d'un serveur.\n"
-"lxc config unset [remote:][container] <key>                                 Désaffecter une clé de configuration d'un conteneur ou d'un serveur.\n"
-"lxc config show [remote:][container] [--expanded]                           Afficher la configuration d'un conteneur ou d'un serveur.\n"
-"lxc config edit [remote:][container]                                        Éditer la configuration d'un conteneur ou d'un serveur dans un éditeur externe.\n"
-"    Éditer la configuration, soit en lançant un éditeur externe ou en lisant STDIN.\n"
+"lxc config device add [<remote>:]<container> <name> <type> [key=value]...   "
+"Ajouter un périphérique à un conteneur.\n"
+"lxc config device get [<remote>:]<container> <name> <key>                   "
+"Obtenir la propriété d'un périphérique.\n"
+"lxc config device set [<remote>:]<container> <name> <key> <value>           "
+"Positionner la propriété d'un périphérique.\n"
+"lxc config device unset [<remote>:]<container> <name> <key>                 "
+"Désaffecter la propriété d'un périphérique.\n"
+"lxc config device list [<remote>:]<container>                               "
+"Lister les périphériques d'un conteneur.\n"
+"lxc config device show [<remote>:]<container>                               "
+"Afficher les détails des périphériques d'un conteneur.\n"
+"lxc config device remove [<remote>:]<container> <name>                      "
+"Supprimer les périphériques d'un conteneur.\n"
+"\n"
+"lxc config get [<remote>:]<container> <key>                                 "
+"Obtenir une clé de configuration d'un conteneur ou d'un serveur.\n"
+"lxc config set [<remote>:]<container> <key> <value>                         "
+"Positionner une clé de configuration d'un conteneur ou d'un serveur.\n"
+"lxc config unset [<remote>:]<container> <key>                               "
+"Désaffecter une clé de configuration d'un conteneur ou d'un serveur.\n"
+"lxc config show [<remote>:]<container> [--expanded]                         "
+"Afficher la configuration d'un conteneur ou d'un serveur.\n"
+"lxc config edit [<remote>:]<container>                                      "
+"Éditer la configuration d'un conteneur ou d'un serveur dans un éditeur "
+"externe.\n"
+"    Éditer la configuration, soit en lançant un éditeur externe ou en lisant "
+"STDIN.\n"
 "    Exemple : lxc config edit <container> # nace l'éditeur\n"
-"              cat config.yaml | lxc config edit <config> # lit depuis config.yaml\n"
+"              cat config.yaml | lxc config edit <config> # lit depuis config."
+"yaml\n"
 "\n"
-"lxc config trust list [remote]                                              Lister tous les certificats de confiance.\n"
-"lxc config trust add [remote] <certfile.crt>                                Ajouter certfile.crt aux hôtes de confiance.\n"
-"lxc config trust remove [remote] [hostname|fingerprint]                     Supprimer le certificat des hôtes de confiance.\n"
+"lxc config trust list [<remote>:]                                           "
+"Lister tous les certificats de confiance.\n"
+"lxc config trust add [<remote>:] <certfile.crt>                             "
+"Ajouter certfile.crt aux hôtes de confiance.\n"
+"lxc config trust remove [<remote>:] [hostname|fingerprint]                  "
+"Supprimer le certificat des hôtes de confiance.\n"
 "\n"
 "Exemples :\n"
 "Pour monter le répertoire /share/c1 sur le répertoire /opt du conteneur :\n"
-"    lxc config device add [remote:]container1 <device-name> disk source=/share/c1 path=opt\n"
+"    lxc config device add [remote:]container1 <device-name> disk source=/"
+"share/c1 path=opt\n"
 "\n"
 "Pour positionner une clé de configuration dans la configuration lxc :\n"
-"    lxc config set [remote:]<container> raw.lxc 'lxc.aa_allow_incomplete = 1'\n"
+"    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"
+"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/file.go:35
+#: lxc/file.go:36
 msgid ""
-"Manage files on a container.\n"
+"Manage files in a container.\n"
 "\n"
-"lxc file pull [-r|--recursive] <source> [<source>...] <target>\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> [<source>...] <target>\n"
-"lxc file edit <file>\n"
+"mode=MODE] <source path> [<source path>...] [<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"
-"\n"
 "To push /etc/hosts into the container foo:\n"
-"  lxc file push /etc/hosts foo/etc/hosts\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 .\n"
+"    lxc file pull foo/etc/hosts ."
 msgstr ""
 "Gérer les fichiers dans un conteneur.\n"
 "\n"
-"lxc file pull [-r|--recursive] <source> [<source>...] <target>\n"
-"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--mode=MODE] <source> [<source>...] <target>\n"
-"lxc file edit <file>\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 edit [<remote>:]<container>/<path>\n"
 "\n"
-"<source> dans le cas de pull, <target> dans le cas de push et <file> in the dans le cas d'edit sont de la forme <container name>/<path>\n"
+"<source> dans le cas de pull, <target> dans le cas de push et <file> in the "
+"dans le cas d'edit sont de la forme <container name>/<path>\n"
 "\n"
 "Exemples :\n"
 "\n"
@@ -1031,76 +1107,97 @@ msgstr ""
 msgid ""
 "Manage networks.\n"
 "\n"
-"lxc network list                               List available networks.\n"
-"lxc network show <network>                     Show details of a network.\n"
-"lxc network create <network> [key=value]...    Create a network.\n"
-"lxc network get <network> <key>                Get network configuration.\n"
-"lxc network set <network> <key> <value>        Set network configuration.\n"
-"lxc network unset <network> <key>              Unset network configuration.\n"
-"lxc network delete <network>                   Delete a network.\n"
-"lxc network edit <network>\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 <network> <container> [device name]\n"
-"lxc network attach-profile <network> <profile> [device name]\n"
+"lxc network attach [<remote>:]<network> <container> [device name]\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name]\n"
 "\n"
-"lxc network detach <network> <container> [device name]\n"
-"lxc network detach-profile <network> <container> [device name]\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                               Lister les réseaux disponibles.\n"
-"lxc network show <network>                     Afficher les détails d'un réseau.\n"
-"lxc network create <network> [key=value]...    Créer un réseau.\n"
-"lxc network get <network> <key>                Récupérer une configuration du réseau.\n"
-"lxc network set <network> <key> <value>        Positionner une configuration du réseau.\n"
-"lxc network unset <network> <key>              Désaffecter une configuration du réseau.\n"
-"lxc network delete <network>                   Supprimer un réseau.\n"
-"lxc network edit <network>\n"
-"    Éditer le réseau, soit en lançant un éditeur externe ou en lisant STDIN.\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"
+"              cat network.yaml | lxc network edit <network> # lire depuis "
+"network.yaml\n"
 "\n"
-"lxc network attach <network> <container> [device name]\n"
-"lxc network attach-profile <network> <profile> [device name]\n"
+"lxc network attach [<remote>:]<network> <container> [device name]\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name]\n"
 "\n"
-"lxc network detach <network> <container> [device name]\n"
-"lxc network detach-profile <network> <container> [device name]"
+"lxc network detach [<remote>:]<network> <container> [device name]\n"
+"lxc network detach-profile [<remote>:]<network> <container> [device name]"
 
-#: lxc/remote.go:38
+#: lxc/remote.go:37
 msgid ""
 "Manage remote LXD servers.\n"
 "\n"
-"lxc remote add [<name>] <IP|FQDN|URL> [--accept-certificate] [--"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
 "password=PASSWORD]\n"
-"                                      [--public] [--protocol=PROTOCOL]      "
+"                                        [--public] [--protocol=PROTOCOL]    "
 "Add the remote <name> at <url>.\n"
-"lxc remote remove <name>                                                    "
+"lxc remote remove <remote>                                                  "
 "Remove the remote <name>.\n"
 "lxc remote list                                                             "
 "List all remotes.\n"
-"lxc remote rename <old> <new>                                               "
+"lxc remote rename <old name> <new name>                                     "
 "Rename remote <old> to <new>.\n"
-"lxc remote set-url <name> <url>                                             "
+"lxc remote set-url <remote> <url>                                           "
 "Update <name>'s url to <url>.\n"
-"lxc remote set-default <name>                                               "
+"lxc remote set-default <remote>                                             "
 "Set the default remote.\n"
 "lxc remote get-default                                                      "
 "Print the default remote."
 msgstr ""
 "Gérer les serveur LXD distants.\n"
 "\n"
-"lxc remote add [<name>] <IP|FQDN|URL> [--accept-certificate] [--password=PASSWORD]\n"
-"                                      [--public] [--protocol=PROTOCOL]      Ajouter le serveur distant <name> accessible via <url>.\n"
-"lxc remote remove <name>                                                    Supprimer le serveur distant <name>.\n"
-"lxc remote list                                                             Lister tous les serveurs distants.\n"
-"lxc remote rename <old> <new>                                               Renommer le serveur distant de <old> en <new>.\n"
-"lxc remote set-url <name> <url>                                             Mettre à jour l'url de <name> en <url>.\n"
-"lxc remote set-default <name>                                               Choisir le serveur distant par défaut.\n"
-"lxc remote get-default                                                      Afficher le serveur distant par défaut."
+"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/image.go:95
 msgid ""
@@ -1121,22 +1218,22 @@ msgid ""
 "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"
+"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"
+"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"
+"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"
+"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"
@@ -1148,31 +1245,31 @@ msgid ""
 "    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"
+"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"
+"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"
+"lxc image show [<remote>:]<image>\n"
 "    Yaml output of the user modifiable properties of an image.\n"
 "\n"
-"lxc image edit [remote:]<image>\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"
+"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"
+"lxc image alias delete [<remote>:]<alias>\n"
 "    Delete an alias.\n"
 "\n"
-"lxc image alias list [remote:] [filter]\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.\n"
+"image alias name."
 msgstr ""
 "Manipuler les images de conteneur.\n"
 "\n"
@@ -1192,21 +1289,25 @@ msgstr ""
 "le plus court ou leur alias (s'il est positionné).\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"
+"lxc image import <tarball> [<rootfs tarball>|<URL>] [<remote>:] [--public] "
+"[--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
+"[--alias=ALIAS].. [prop=value]\n"
 "    Importer l'archive (ou les archives) tar d'une image dans le dépôt LXD.\n"
 "\n"
-"lxc image copy [remote:]<image> <remote>: [--alias=ALIAS].. [--copy-aliases] [--public] [--auto-update]\n"
+"lxc image copy [<remote>:]<image> <remote>: [--alias=ALIAS].. [--copy-"
+"aliases] [--public] [--auto-update]\n"
 "    Copier une image d'un démon LXD vers un autre au travers du réseau.\n"
 "\n"
 "    Le booléen auto-update indique au serveur qu'il doit garder cette image\n"
 "    à jour.  Cela requiert que la source soit un alias et qu'elle soit\n"
 "    publique.\n"
 "\n"
-"lxc image delete [remote:]<image> [remote:][<image>...]\n"
+"lxc image delete [<remote>:]<image> [<remote>:][<image>...]\n"
 "    Supprimer une ou plusieurs images du dépôt LXD.\n"
 "\n"
-"lxc image export [remote:]<image> [target]\n"
-"    Exporter une image du dépôt LXD sous la forme d'une archive tar distribuable.\n"
+"lxc image export [<remote>:]<image> [<target>]\n"
+"    Exporter une image du dépôt LXD sous la forme d'une archive tar "
+"distribuable.\n"
 "\n"
 "    La cible en sortie est optionnelle et le répertoire de travail est sa\n"
 "    valeur par défaut.  La cible peut être un répertoire existant, un nom\n"
@@ -1219,30 +1320,31 @@ msgstr ""
 "    nom de fichier fourni suivant l'algorithme utilisé pour comprimer\n"
 "    l'image.\n"
 "\n"
-"lxc image info [remote:]<image>\n"
+"lxc image info [<remote>:]<image>\n"
 "    Afficher toutes les informations connues concernant une image donnée.\n"
 "\n"
-"lxc image list [remote:] [filter] [--format table|json]\n"
+"lxc image list [<remote>:] [filter] [--format table|json]\n"
 "    Lister les images contenues dans le dépôt LXD.  Les filtres peuvent\n"
 "    être de la forme <clé>=<valeur> pour un filtrage sur les propriétés, ou\n"
 "    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"
+"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"
+"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"
+"              cat image.yaml | lxc image edit <image> # lit depuis image."
+"yaml\n"
 "\n"
-"lxc image alias create [remote:]<alias> <fingerprint>\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"
+"lxc image alias delete [<remote>:]<alias>\n"
 "    Supprimer un alias.\n"
 "\n"
-"lxc image alias list [remote:] [filter]\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."
 
@@ -1262,7 +1364,7 @@ msgstr "Résumé manquant."
 msgid ""
 "Monitor activity on the LXD server.\n"
 "\n"
-"lxc monitor [remote:] [--type=TYPE...]\n"
+"lxc monitor [<remote>:] [--type=TYPE...]\n"
 "\n"
 "Connects to the monitoring interface of the specified LXD server.\n"
 "\n"
@@ -1270,11 +1372,11 @@ msgid ""
 "Specific types to listen to can be specified with --type.\n"
 "\n"
 "Example:\n"
-"lxc monitor --type=logging"
+"    lxc monitor --type=logging"
 msgstr ""
 "Superviser l'activité du serveur LXD.\n"
 "\n"
-"lxc monitor [remote:] [--type=TYPE...]\n"
+"lxc monitor [<remote>:] [--type=TYPE...]\n"
 "\n"
 "Se connecte à l'interface de supervision du serveur LXD spécifié.\n"
 "\n"
@@ -1284,43 +1386,50 @@ msgstr ""
 "Exemple :\n"
 "lxc monitor --type=logging"
 
-#: lxc/network.go:216 lxc/network.go:265
+#: lxc/network.go:215 lxc/network.go:264
 msgid "More than one device matches, specify the device name."
 msgstr "Plus d'un périphérique correspond, spécifiez le nom du périphérique."
 
-#: lxc/file.go:235
+#: lxc/file.go:237
 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"
+msgstr ""
+"Plusieurs fichiers à télécharger, mais la destination n'est pas un dossier"
 
 #: lxc/move.go:16
 msgid ""
 "Move containers within or in between lxd instances.\n"
 "\n"
-"lxc move [remote:]<source container> [remote:]<destination container>\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 ""
 "Déplacer les conteneurs vers ou entre des instances lxd.\n"
 "\n"
-"lxc move [remote:]<source container> [remote:]<destination container>\n"
+"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."
+"    Renomme un conteneur local.\n"
+"\n"
+"lxc move <container>/<old snapshot name> <container>/<new snapshot name>\n"
+"    Renomme un instantané."
 
 #: lxc/action.go:69
 msgid "Must supply container name for: "
 msgstr "Vous devez spécifier le nom d'un conteneur pour : "
 
-#: lxc/list.go:428 lxc/network.go:422 lxc/profile.go:447 lxc/remote.go:381
+#: lxc/list.go:428 lxc/network.go:421 lxc/profile.go:446 lxc/remote.go:380
 msgid "NAME"
 msgstr "NOM"
 
-#: lxc/network.go:408 lxc/remote.go:355 lxc/remote.go:360
+#: lxc/network.go:407 lxc/remote.go:354 lxc/remote.go:359
 msgid "NO"
 msgstr "NON"
 
@@ -1329,12 +1438,12 @@ msgstr "NON"
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: lxc/network.go:190
+#: lxc/network.go:189
 #, c-format
 msgid "Network %s created"
 msgstr "Le réseau %s a été créé"
 
-#: lxc/network.go:293
+#: lxc/network.go:292
 #, c-format
 msgid "Network %s deleted"
 msgstr "Le réseau % a été supprimé"
@@ -1343,17 +1452,15 @@ msgstr "Le réseau % a été supprimé"
 msgid "Network name"
 msgstr "Nom du réseau"
 
-#: lxc/image.go:168 lxc/publish.go:34
+#: lxc/image.go:167 lxc/publish.go:34
 msgid "New alias to define at target"
 msgstr "Nouvel alias à définir sur la cible"
 
 #: lxc/config.go:284
-#, fuzzy
 msgid "No certificate provided to add"
 msgstr "Un certificat à ajouter n'a pas été fourni"
 
-#: lxc/network.go:225 lxc/network.go:274
-#, fuzzy
+#: lxc/network.go:224 lxc/network.go:273
 msgid "No device found for this network"
 msgstr "Aucun périphérique existant pour ce réseau"
 
@@ -1361,20 +1468,19 @@ msgstr "Aucun périphérique existant pour ce réseau"
 msgid "No fingerprint specified."
 msgstr "Aucune empreinte n'a été spécifiée."
 
-#: lxc/remote.go:121
+#: 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:434
+#: lxc/image.go:424
 msgid "Only https:// is supported for remote image import."
 msgstr "Seul https:// est supporté par l'import d'images distantes."
 
 #: lxc/help.go:63 lxc/main.go:112
-#, fuzzy
 msgid "Options:"
 msgstr "Options :"
 
-#: lxc/image.go:538
+#: lxc/image.go:535
 #, c-format
 msgid "Output is in %s"
 msgstr "Le résultat est dans %s"
@@ -1395,11 +1501,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr "PROFILS"
 
-#: lxc/remote.go:383
+#: lxc/remote.go:382
 msgid "PROTOCOL"
 msgstr "PROTOCOLE"
 
-#: lxc/image.go:640 lxc/remote.go:384
+#: lxc/image.go:637 lxc/remote.go:383
 msgid "PUBLIC"
 msgstr ""
 
@@ -1412,14 +1518,12 @@ msgid "Packets sent"
 msgstr "Paquets émis"
 
 #: lxc/help.go:70
-#, fuzzy
-msgid "Path to an alternate client configuration directory."
-msgstr "Chemin vers un dossier de configuration client alternatif."
+msgid "Path to an alternate client configuration directory"
+msgstr "Chemin vers un dossier de configuration client alternatif"
 
 #: lxc/help.go:71
-#, fuzzy
-msgid "Path to an alternate server directory."
-msgstr "Chemin vers un dossier de configuration serveur alternatif."
+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?"
@@ -1430,43 +1534,31 @@ msgstr "Permission refusée, êtes-vous dans le groupe lxd ?"
 msgid "Pid: %d"
 msgstr "Pid : %d"
 
-#: lxc/help.go:25
-#, fuzzy
-msgid ""
-"Presents details on how to use LXD.\n"
-"\n"
-"lxd help [--all]"
-msgstr ""
-"Explique comment utiliser LXD.\n"
-"\n"
-"lxd help [--all]"
-
-#: lxc/network.go:343 lxc/profile.go:219
+#: lxc/network.go:342 lxc/profile.go:218
 msgid "Press enter to open the editor again"
 msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
 
-#: lxc/config.go:531 lxc/config.go:596 lxc/image.go:735
+#: lxc/config.go:531 lxc/config.go:596 lxc/image.go:732
 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."
+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."
+msgid "Print less common commands"
+msgstr "Afficher les commandes moins communes"
 
 #: lxc/help.go:66
-msgid "Print verbose information."
-msgstr "Afficher ds informations supplémentaires."
-
-#: lxc/manpage.go:18
-msgid "Prints all the subcommands help."
-msgstr "Afficher l'aide de toutes les sous-commandes."
+msgid "Print verbose information"
+msgstr "Afficher ds informations supplémentaires"
 
 #: lxc/version.go:18
-#, fuzzy
 msgid ""
 "Prints the version number of this client tool.\n"
 "\n"
@@ -1477,26 +1569,26 @@ msgstr ""
 "lxc version"
 
 #: lxc/info.go:130
-#, fuzzy, c-format
+#, c-format
 msgid "Processes: %d"
-msgstr "Processus : %s"
+msgstr "Processus : %d"
 
-#: lxc/profile.go:275
-#, fuzzy, c-format
+#: lxc/profile.go:274
+#, c-format
 msgid "Profile %s added to %s"
 msgstr "Profil %s ajouté à %s"
 
-#: lxc/profile.go:170
+#: lxc/profile.go:169
 #, c-format
 msgid "Profile %s created"
 msgstr "Profil %s créé"
 
-#: lxc/profile.go:240
+#: lxc/profile.go:239
 #, c-format
 msgid "Profile %s deleted"
 msgstr "Profil %s supprimé"
 
-#: lxc/profile.go:306
+#: lxc/profile.go:305
 #, c-format
 msgid "Profile %s removed from %s"
 msgstr "Profil %s supprimé de %s"
@@ -1506,25 +1598,25 @@ msgstr "Profil %s supprimé de %s"
 msgid "Profile to apply to the new container"
 msgstr "Profil à appliquer au nouveau conteneur"
 
-#: lxc/profile.go:256
+#: lxc/profile.go:255
 #, c-format
 msgid "Profiles %s applied to %s"
 msgstr "Profils %s appliqués à %s"
 
 #: lxc/info.go:104
-#, fuzzy, c-format
+#, c-format
 msgid "Profiles: %s"
 msgstr "Profils : %s"
 
-#: lxc/image.go:361
+#: lxc/image.go:358
 msgid "Properties:"
 msgstr "Propriétés :"
 
-#: lxc/remote.go:55
+#: lxc/remote.go:54
 msgid "Public image server"
 msgstr "Serveur d'images public"
 
-#: lxc/image.go:349
+#: lxc/image.go:346
 #, c-format
 msgid "Public: %s"
 msgstr "Public :"
@@ -1533,18 +1625,19 @@ msgstr "Public :"
 msgid ""
 "Publish containers as images.\n"
 "\n"
-"lxc publish [remote:]container [remote:] [--alias=ALIAS]... [prop-key=prop-"
-"value]..."
+"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]"
 msgstr ""
 "Publier des conteneurs en tant qu'image.\n"
 "\n"
-"lxc publish [remote:]container [remote:] [--alias=ALIAS]... [prop-key=prop-value]..."
+"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]"
 
-#: lxc/file.go:58 lxc/file.go:59
+#: lxc/file.go:57 lxc/file.go:58
 msgid "Recursively push or pull files"
 msgstr "Pousser ou récupérer des fichiers récursivement"
 
-#: lxc/remote.go:53
+#: lxc/remote.go:52
 msgid "Remote admin password"
 msgstr "Mot de passe de l'administrateur distant"
 
@@ -1559,19 +1652,49 @@ msgid "Remove %s (yes/no): "
 msgstr "Supprimer %s (yes/no) : "
 
 #: lxc/delete.go:36 lxc/delete.go:37
-msgid "Require user confirmation."
-msgstr "Requérir une confirmation de l'utilisateur."
+msgid "Require user confirmation"
+msgstr "Requérir une confirmation de l'utilisateur"
 
 #: lxc/info.go:127
 msgid "Resources:"
 msgstr "Ressources :"
 
-#: lxc/init.go:267
+#: 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 ""
+"Restaurer l'état d'une ressource 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:239
 #, c-format
 msgid "Retrieving image: %s"
 msgstr "Récupérer l'image : %s"
 
-#: lxc/image.go:643
+#: lxc/image.go:640
 msgid "SIZE"
 msgstr "TAILLE"
 
@@ -1583,55 +1706,32 @@ msgstr "INSTANTANÉS"
 msgid "STATE"
 msgstr "ÉTAT"
 
-#: lxc/remote.go:385
+#: lxc/remote.go:384
 msgid "STATIC"
 msgstr "STATIQUE"
 
-#: lxc/remote.go:226
+#: lxc/remote.go:225
 msgid "Server certificate NACKed by user"
 msgstr "Le certificat serveur a été rejeté par l'utilisateur"
 
-#: lxc/remote.go:288
+#: lxc/remote.go:287
 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"
+msgstr ""
+"Le serveur ne nous fait pas confiance après l'ajout de notre certificat"
 
-#: lxc/remote.go:54
+#: lxc/remote.go:53
 msgid "Server protocol (lxd or simplestreams)"
 msgstr "Protocole du serveur (lxd ou simplestreams)"
 
-#: lxc/restore.go:21
-msgid ""
-"Set the current state of a resource back to a snapshot.\n"
-"\n"
-"lxc restore [remote:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
-"\n"
-"For example:\n"
-"lxc snapshot u1 snap0 # create the snapshot\n"
-"lxc restore u1 snap0 # restore the snapshot"
-msgstr ""
-"Restaurer l'état d'une ressource depuis un instantané.\n"
-"\n"
-"lxc restore [remote:]<container> <snapshot name> [--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"
-"lxc snapshot u1 snap0 # crée l'instantané\n"
-"lxc restore u1 snap0 # restaure l'instantané"
-
-#: lxc/file.go:56
+#: lxc/file.go:55
 msgid "Set the file's gid on push"
 msgstr "Définir le gid du fichier lors de l'envoi"
 
-#: lxc/file.go:57
+#: lxc/file.go:56
 msgid "Set the file's perms on push"
 msgstr "Définir les permissions du fichier lors de l'envoi"
 
-#: lxc/file.go:55
+#: lxc/file.go:54
 msgid "Set the file's uid on push"
 msgstr "Définir l'uid du fichier lors de l'envoi"
 
@@ -1640,14 +1740,18 @@ 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."
+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/image.go:347
+#: lxc/config.go:32
+msgid "Show the expanded configuration"
+msgstr "Afficher ou pas la configuration étendue"
+
+#: lxc/image.go:344
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "Taille : %.2f Mo"
@@ -1656,11 +1760,11 @@ msgstr "Taille : %.2f Mo"
 msgid "Snapshots:"
 msgstr "Instantanés :"
 
-#: lxc/image.go:371
+#: lxc/image.go:368
 msgid "Source:"
 msgstr "Source :"
 
-#: lxc/launch.go:142
+#: lxc/launch.go:144
 #, c-format
 msgid "Starting %s"
 msgstr "Démarrage de %s"
@@ -1679,9 +1783,8 @@ msgid "Stopping container failed!"
 msgstr "L'arrêt du conteneur a échoué !"
 
 #: lxc/action.go:45
-#, fuzzy
-msgid "Store the container state (only for stop)."
-msgstr "Forcer l'arrêt du conteneur (seulement pour stop)."
+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)"
@@ -1691,31 +1794,34 @@ msgstr "Swap (courant)"
 msgid "Swap (peak)"
 msgstr "Swap (pointe)"
 
-#: lxc/list.go:433 lxc/network.go:423
+#: lxc/list.go:433 lxc/network.go:422
 msgid "TYPE"
 msgstr ""
 
 #: lxc/delete.go:92
 msgid "The container is currently running, stop it first or pass --force."
-msgstr "Le conteneur est en cours d'exécution, arrêtez-le d'abord ou ajoutez --force."
+msgstr ""
+"Le conteneur est en cours d'exécution, arrêtez-le d'abord ou ajoutez --force."
 
 #: lxc/publish.go:91
 msgid ""
 "The container is currently running. Use --force to have it stopped and "
 "restarted."
-msgstr "Le conteneur est en cours d'exécution. Utilisez --force pour qu'il soit arrêté et redémarré."
+msgstr ""
+"Le conteneur est en cours d'exécution. Utilisez --force pour qu'il soit "
+"arrêté et redémarré."
 
-#: lxc/init.go:313
-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/init.go:312
+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:675 lxc/config.go:687 lxc/config.go:720 lxc/config.go:738
 #: lxc/config.go:776 lxc/config.go:794
-#, fuzzy
 msgid "The device doesn't exist"
 msgstr "Le périphérique n'existe pas"
 
-#: lxc/init.go:297
+#: lxc/init.go:296
 #, 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, essayez '%s:' à la place."
@@ -1724,13 +1830,11 @@ msgstr "L'image locale '%s' n'a pas été trouvée, essayez '%s:' à la place."
 msgid "The opposite of `lxc pause` is `lxc start`."
 msgstr "Le pendant de `lxc pause` est `lxc start`."
 
-#: lxc/network.go:230 lxc/network.go:279
-#, fuzzy
+#: lxc/network.go:229 lxc/network.go:278
 msgid "The specified device doesn't exist"
 msgstr "Le périphérique indiqué n'existe pas"
 
-#: lxc/network.go:234 lxc/network.go:283
-#, fuzzy
+#: lxc/network.go:233 lxc/network.go:282
 msgid "The specified device doesn't match the network"
 msgstr "le périphérique indiqué ne correspond pas au réseau"
 
@@ -1739,31 +1843,32 @@ 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:41
-msgid "Time to wait for the container before killing it."
-msgstr "Temps d'attente du conteneur avant de le tuer."
+msgid "Time to wait for the container before killing it"
+msgstr "Temps d'attente du conteneur avant de le tuer"
 
-#: lxc/image.go:350
+#: lxc/image.go:347
 msgid "Timestamps:"
 msgstr "Horodatage :"
 
-#: lxc/init.go:315
+#: lxc/init.go:314
 msgid "To attach a network to a container, use: lxc network attach"
 msgstr "Pour attacher un réseau à un conteneur, utilisez : lxc network attach"
 
-#: lxc/init.go:314
+#: lxc/init.go:313
 msgid "To create a new network, use: lxc network create"
 msgstr "Pour créer un réseau, utilisez : lxc network create"
 
 #: lxc/main.go:137
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
-msgstr "Pour démarrer votre premier conteneur, essayez : lxc launch ubuntu:16.04"
+msgstr ""
+"Pour démarrer votre premier conteneur, essayez : lxc launch ubuntu:16.04"
 
-#: lxc/image.go:421
+#: lxc/image.go:426
 #, c-format
-msgid "Transferring image: %d%%"
-msgstr "Transfert de l'image : %d %%"
+msgid "Transferring image: %s"
+msgstr "Transfert de l'image : %s"
 
-#: lxc/action.go:99 lxc/launch.go:155
+#: lxc/action.go:99 lxc/launch.go:157
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr "Essayez `lxc info --show-log %s` pour plus d'informations"
@@ -1776,68 +1881,65 @@ msgstr "Type : éphémère"
 msgid "Type: persistent"
 msgstr "Type : persistant"
 
-#: lxc/image.go:644
+#: lxc/image.go:641
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
-#: lxc/remote.go:382
+#: lxc/remote.go:381
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:425 lxc/profile.go:448
+#: lxc/network.go:424 lxc/profile.go:447
 msgid "USED BY"
 msgstr "UTILISÉ PAR"
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Unable to read remote TLS certificate"
 msgstr "Impossible de lire le certificat TLS distant"
 
-#: lxc/image.go:355
+#: lxc/image.go:352
 #, c-format
 msgid "Uploaded: %s"
 msgstr "Publié : %s"
 
 #: lxc/main.go:112
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s"
 msgstr "Utilisation : %s"
 
 #: lxc/help.go:48
-#, fuzzy
-msgid "Usage: lxc [subcommand] [options]"
-msgstr "Utilisation : lxc [sous-commande] [options]"
+msgid "Usage: lxc <command> [options]"
+msgstr "Utilisation : lxc <commande> [options]"
 
 #: lxc/delete.go:46
 msgid "User aborted delete operation."
 msgstr "L'utilisateur a annulé l'opération de suppression."
 
-#: lxc/restore.go:35
-#, fuzzy
+#: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
 "available)"
-msgstr "Restaurer ou pas l'état de fonctionnement du conteneur depuis l'instantané (s'il est disponible)"
+msgstr ""
+"Restaurer ou pas l'état de fonctionnement du conteneur depuis l'instantané "
+"(s'il est disponible)"
 
 #: lxc/snapshot.go:38
 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/config.go:32
-msgid "Whether to show the expanded configuration"
-msgstr "Afficher ou pas la configuration étendue"
-
-#: lxc/network.go:410 lxc/remote.go:357 lxc/remote.go:362
+#: lxc/network.go:409 lxc/remote.go:356 lxc/remote.go:361
 msgid "YES"
 msgstr "OUI"
 
 #: lxc/main.go:52
 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`"
+msgstr ""
+"La commande `lxc config profile` est dépréciée, merci d'utiliser `lxc "
+"profile`"
 
-#: lxc/launch.go:127
-#, fuzzy
+#: lxc/launch.go:128
 msgid "bad number of things scanned from image, container or snapshot"
-msgstr "nombre d'éléments invalide dans la ressource"
+msgstr "nombre d'éléments invalide dans l'image, conteneur ou instantané"
 
 #: lxc/action.go:95
 msgid "bad result type from action"
@@ -1847,51 +1949,50 @@ msgstr "type de réponse renvoyé par l'action invalide !"
 msgid "can't copy to the same container name"
 msgstr "impossible de copier vers le même nom de conteneur"
 
-#: lxc/file.go:270
+#: lxc/file.go:272
 msgid "can't pull a directory without --recursive"
 msgstr "impossible de récupérer un répertoire sans --recursive"
 
-#: lxc/remote.go:345
+#: lxc/remote.go:344
 msgid "can't remove the default remote"
 msgstr "impossible de supprimer le serveur distant par défaut"
 
-#: lxc/file.go:117
+#: lxc/file.go:119
 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:371
+#: lxc/remote.go:370
 msgid "default"
 msgstr "par défaut"
 
 #: lxc/copy.go:131 lxc/copy.go:136 lxc/copy.go:232 lxc/copy.go:237
-#: lxc/init.go:217 lxc/init.go:222 lxc/launch.go:111 lxc/launch.go:116
-#, fuzzy
+#: lxc/init.go:219 lxc/init.go:224 lxc/launch.go:112 lxc/launch.go:117
 msgid "didn't get any affected image, container or snapshot from server"
-msgstr "pas de réponse du serveur pour cette ressource"
+msgstr "pas de réponse du serveur pour cette image, conteneur ou instantané"
 
-#: lxc/image.go:341
+#: lxc/image.go:338
 msgid "disabled"
 msgstr "désactivé"
 
-#: lxc/image.go:343
+#: lxc/image.go:340
 msgid "enabled"
 msgstr "activé"
 
 #: lxc/main.go:22 lxc/main.go:148
-#, fuzzy, c-format
+#, c-format
 msgid "error: %v"
 msgstr "erreur : %v"
 
 #: lxc/help.go:40 lxc/main.go:107
-#, fuzzy, c-format
+#, c-format
 msgid "error: unknown command: %s"
 msgstr "erreur : commande inconnue: %s"
 
-#: lxc/launch.go:131
+#: lxc/launch.go:132
 msgid "got bad version"
 msgstr "version reçue invalide"
 
-#: lxc/image.go:336 lxc/image.go:620
+#: lxc/image.go:333 lxc/image.go:617
 msgid "no"
 msgstr "non"
 
@@ -1899,8 +2000,7 @@ 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:219
-#, fuzzy
+#: lxc/remote.go:218
 msgid "ok (y/n)?"
 msgstr "ok (y/n) ?"
 
@@ -1909,26 +2009,26 @@ msgstr "ok (y/n) ?"
 msgid "processing aliases failed %s\n"
 msgstr "l'analyse des alias a échoué %s\n"
 
-#: lxc/file.go:311
+#: lxc/file.go:313
 msgid "recursive edit doesn't make sense :("
 msgstr "l'édition récursive ne fait aucun sens :("
 
-#: lxc/remote.go:407
+#: lxc/remote.go:406
 #, c-format
 msgid "remote %s already exists"
 msgstr "le serveur distant %s existe déjà"
 
-#: lxc/remote.go:337 lxc/remote.go:399 lxc/remote.go:434 lxc/remote.go:450
+#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "le serveur distant %s n'existe pas"
 
-#: lxc/remote.go:320
+#: lxc/remote.go:319
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "le serveur distant %s existe en tant que <%s>"
 
-#: lxc/remote.go:341 lxc/remote.go:403 lxc/remote.go:438
+#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr "le serveur distant %s est statique et ne peut être modifié"
@@ -1954,203 +2054,10 @@ msgstr "Un retour impossible à été renvoyé"
 msgid "wrong number of subcommand arguments"
 msgstr "nombre d'arguments incorrect pour la sous-comande"
 
-#: lxc/delete.go:45 lxc/image.go:338 lxc/image.go:624
+#: lxc/delete.go:45 lxc/image.go:335 lxc/image.go:621
 msgid "yes"
 msgstr "oui"
 
 #: lxc/copy.go:44
 msgid "you must specify a source container name"
 msgstr "vous devez spécifier un nom de conteneur source"
-
-#, fuzzy
-#~ msgid "Bad image property: %s"
-#~ msgstr "Propriété d'image invalide : %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Create a read-only snapshot of a container.\n"
-#~ "\n"
-#~ "lxc snapshot [remote:]<source> <snapshot name> [--stateful]"
-#~ msgstr ""
-#~ "Prendre un instantané en lecture seule d'un conteneur.\n"
-#~ "\n"
-#~ "lxc snapshot [remote:]<source> <snapshot name> [--stateful]"
-
-#, fuzzy
-#~ msgid ""
-#~ "Set the current state of a resource back to its state at the time the "
-#~ "snapshot was created.\n"
-#~ "\n"
-#~ "lxc restore [remote:]<resource> <snapshot name> [--stateful]"
-#~ msgstr ""
-#~ "Restaurer l'état d'une ressource à celui qui était le sien à la date de création de l'instantané.\n"
-#~ "\n"
-#~ "lxc restore [remote:]<resource> <snapshot name> [--stateful]"
-
-#~ msgid "api version mismatch: mine: %q, daemon: %q"
-#~ msgstr "incohérence de version de l'API : local : %q, distant : %q"
-
-#, fuzzy
-#~ msgid "bad version in profile url"
-#~ msgstr "version invalide dans l'URL du profil"
-
-#, fuzzy
-#~ msgid "device already exists"
-#~ msgstr "le périphérique existe déjà"
-
-#, fuzzy
-#~ msgid "error."
-#~ msgstr "erreur."
-
-#~ msgid "got bad op status %s"
-#~ msgstr "statut d'opération reçu invalide %s"
-
-#, fuzzy
-#~ msgid "got bad response type, expected %s got %s"
-#~ msgstr "type de réponse reçue invalide, attendait %s reçu %s"
-
-#~ msgid "invalid wait url %s"
-#~ msgstr "URL d'attente invalide %s"
-
-#~ msgid "no response!"
-#~ msgstr "pas de réponse !"
-
-#~ msgid "unknown remote name: %q"
-#~ msgstr "serveur distant inconnu : %q"
-
-#, fuzzy
-#~ msgid "unknown transport type: %s"
-#~ msgstr "type de transport inconnu : %s"
-
-#~ msgid "cannot resolve unix socket address: %v"
-#~ msgstr "impossible de résoudre l'adresse de la socket unix : %v"
-
-#, fuzzy
-#~ msgid "unknown group %s"
-#~ msgstr "groupe inconnu %s"
-
-#, fuzzy
-#~ msgid "Information about remotes not yet supported"
-#~ msgstr "Il n'est pas encore possible d'obtenir de l'information sur les serveurs distants"
-
-#~ msgid "Unknown image command %s"
-#~ msgstr "Commande d'image inconnue %s"
-
-#~ msgid "Unknown remote subcommand %s"
-#~ msgstr "Commande de serveur distant inconnue %s"
-
-#~ msgid "Unkonwn config trust command %s"
-#~ msgstr "Commande de configuration de confiance inconnue %s"
-
-#, fuzzy
-#~ msgid "YAML parse error %v"
-#~ msgstr "erreur d'analyse YAML : %v"
-
-#~ msgid "invalid argument %s"
-#~ msgstr "argument invalide %s"
-
-#, fuzzy
-#~ msgid "unknown profile cmd %s"
-#~ msgstr "commande de configuration de profil inconnue %s"
-
-#, fuzzy
-#~ msgid "Publish to remote server is not supported yet"
-#~ msgstr "Il n'est pas encore possible de publier sur un serveur distant"
-
-#, fuzzy
-#~ msgid "Use an alternative config path."
-#~ msgstr "Utiliser un chemin alternative pour la configuration."
-
-#, fuzzy
-#~ msgid ""
-#~ "error: %v\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "erreur : %v\n"
-#~ "%s\n"
-
-#, fuzzy
-#~ msgid "Show for remotes is not yet supported\n"
-#~ msgstr "Il n'est pas encore possible d'obtenir les informations d'un serveur distant"
-
-#~ msgid "(Bad alias entry: %s\n"
-#~ msgstr "(Alias invalide : %s\n"
-
-#~ msgid "bad container url %s"
-#~ msgstr "Mauvaise URL de conteneur %s"
-
-#~ msgid "bad version in container url"
-#~ msgstr "version invalide dans l'URL du conteneur"
-
-#, fuzzy
-#~ msgid "Ephemeral containers not yet supported\n"
-#~ msgstr "Les conteneurs éphémères ne sont pas encore supportés\n"
-
-#~ msgid "(Bad image entry: %s\n"
-#~ msgstr "(Image invalide: %s\n"
-
-#~ msgid "Certificate already stored.\n"
-#~ msgstr "Le certificat a déjà été enregistré.\n"
-
-#, fuzzy
-#~ msgid "Non-async response from delete!"
-#~ msgstr "Réponse invalide (non-async) durant la suppression !"
-
-#, fuzzy
-#~ msgid "Non-async response from init!"
-#~ msgstr "Réponse invalide (non-async) durant la création d'un instantané !"
-
-#~ msgid "Non-async response from snapshot!"
-#~ msgstr "Réponse invalide (non-async) de l'instantané !"
-
-#~ msgid "Server certificate has changed"
-#~ msgstr "Le certificat serveur a changé"
-
-#, fuzzy
-#~ msgid "Unexpected non-async response"
-#~ msgstr "Réponse inattendue (non-async) !"
-
-#~ msgid "bad response type from image list!"
-#~ msgstr "mauvais type de réponse pour la liste d'image !"
-
-#~ msgid "bad response type from list!"
-#~ msgstr "mauvais type de réponse pour la liste !"
-
-#, fuzzy
-#~ msgid "got non-async response!"
-#~ msgstr "Réponse reçue invalide (non-async) !"
-
-#~ msgid "got non-sync response from containers get!"
-#~ msgstr "réponse invalide (non-async) durant le chargement du conteneur !"
-
-#~ msgid "Delete a container or container snapshot.\n"
-#~ msgstr "Supprimer un conteneur ou un instantané de conteneur.\n"
-
-#~ msgid "List information on containers.\n"
-#~ msgstr "Lister les informations sur les conteneurs.\n"
-
-#~ msgid "Lists the available resources.\n"
-#~ msgstr "Lister les ressources disponibles.\n"
-
-#~ msgid "Manage files on a container.\n"
-#~ msgstr "Gérer les fichiers d'un conteneur.\n"
-
-#~ msgid "Manage remote lxc servers.\n"
-#~ msgstr "Gérer les serveurs lxc distants.\n"
-
-#~ msgid "Non-async response from create!"
-#~ msgstr "Réponse invalide (non-async) durant la création!"
-
-#~ msgid "Only 'password' can be set currently"
-#~ msgstr "Seul 'password' peut être configuré à l'heure actuelle"
-
-#~ msgid ""
-#~ "lxc image import <tarball> [target] [--created-at=ISO-8601] [--expires-"
-#~ "at=ISO-8601] [--fingerprint=HASH] [prop=value]\n"
-#~ msgstr "lxc image import <tarball> [destination] [--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=HASH] [proprit=valeur]\n"
-
-#~ msgid "lxc init ubuntu [<name>]\n"
-#~ msgstr "lxc init ubuntu [<nom>]\n"
-
-#~ msgid "lxc launch ubuntu [<name>]\n"
-#~ msgstr "lxc launch ubuntu [<nom>]\n"
diff --git a/po/ja.po b/po/ja.po
index 57e1aca..1fc7584 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: 2016-11-04 21:31-0400\n"
+"POT-Creation-Date: 2016-12-15 13:20-0500\n"
 "PO-Revision-Date: 2016-11-09 19:45+0900\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <lxd-ja-language-team at googlegroups.com>\n"
@@ -104,7 +104,7 @@ msgid ""
 "### Note that the name is shown but cannot be changed"
 msgstr ""
 
-#: lxc/image.go:617
+#: lxc/image.go:614
 #, c-format
 msgid "%s (%d more)"
 msgstr ""
@@ -113,15 +113,15 @@ msgstr ""
 msgid "'/' not allowed in snapshot name"
 msgstr "'/' はスナップショットの名前には使用できません。"
 
-#: lxc/profile.go:254
+#: lxc/profile.go:253
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:638 lxc/image.go:680
+#: lxc/image.go:635 lxc/image.go:677
 msgid "ALIAS"
 msgstr ""
 
-#: lxc/image.go:642
+#: lxc/image.go:639
 msgid "ARCH"
 msgstr ""
 
@@ -129,29 +129,25 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:52
+#: lxc/remote.go:51
 msgid "Accept certificate"
 msgstr "証明書を受け入れます"
 
-#: lxc/remote.go:268
+#: lxc/remote.go:267
 #, c-format
 msgid "Admin password for %s: "
 msgstr "%s の管理者パスワード: "
 
-#: lxc/image.go:365
+#: lxc/image.go:362
 msgid "Aliases:"
 msgstr "エイリアス:"
 
-#: lxc/exec.go:54
-msgid "An environment variable of the form HOME=/home/foo"
-msgstr "環境変数を HOME=/home/foo の形式で指定します"
-
-#: lxc/image.go:348 lxc/info.go:93
+#: lxc/image.go:345 lxc/info.go:93
 #, c-format
 msgid "Architecture: %s"
 msgstr "アーキテクチャ: %s"
 
-#: lxc/image.go:369
+#: lxc/image.go:366
 #, c-format
 msgid "Auto update: %s"
 msgstr "自動更新: %s"
@@ -190,27 +186,38 @@ msgstr "標準入力から読み込めません: %s"
 msgid "Can't unset key '%s', it's not currently set."
 msgstr "キー '%s' が指定されていないので削除できません。"
 
-#: lxc/network.go:386 lxc/profile.go:420
+#: lxc/network.go:385 lxc/profile.go:419
 msgid "Cannot provide container name to list"
 msgstr "コンテナ名を取得できません"
 
-#: lxc/remote.go:218
+#: lxc/remote.go:217
 #, c-format
 msgid "Certificate fingerprint: %x"
 msgstr "証明書のフィンガープリント: %x"
 
 #: lxc/action.go:33
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Changes state of one or more containers to %s.\n"
+"Change state of one or more containers to %s.\n"
 "\n"
-"lxc %s <name> [<name>...]%s"
+"lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 msgstr ""
 "1つまたは複数のコンテナの状態を %s に変更します。\n"
 "\n"
 "lxc %s <name> [<name>...]%s"
 
-#: lxc/remote.go:291
+#: lxc/finger.go:15
+#, fuzzy
+msgid ""
+"Check if the LXD instance is up.\n"
+"\n"
+"lxc finger [<remote>:]"
+msgstr ""
+"LXDインスタンスが稼働中かを確認します。\n"
+"\n"
+"lxc finger <remote>"
+
+#: lxc/remote.go:290
 msgid "Client certificate stored at server: "
 msgstr "クライアント証明書がサーバに格納されました: "
 
@@ -223,8 +230,8 @@ msgstr "カラムレイアウト"
 msgid "Config key/value to apply to the new container"
 msgstr "新しいコンテナに適用するキー/値の設定"
 
-#: lxc/config.go:530 lxc/config.go:595 lxc/image.go:734 lxc/network.go:342
-#: lxc/profile.go:218
+#: lxc/config.go:530 lxc/config.go:595 lxc/image.go:731 lxc/network.go:341
+#: lxc/profile.go:217
 #, c-format
 msgid "Config parsing error: %s"
 msgstr "設定の構文エラー: %s"
@@ -237,7 +244,7 @@ msgstr "接続が拒否されました。LXDが実行されていますか?"
 msgid "Container name is mandatory"
 msgstr "コンテナ名を指定する必要があります"
 
-#: lxc/copy.go:140 lxc/copy.go:241 lxc/init.go:227
+#: lxc/copy.go:140 lxc/copy.go:241 lxc/init.go:229
 #, c-format
 msgid "Container name is: %s"
 msgstr "コンテナ名: %s"
@@ -247,15 +254,16 @@ msgstr "コンテナ名: %s"
 msgid "Container published with fingerprint: %s"
 msgstr "コンテナは以下のフィンガープリントで publish されます: %s"
 
-#: lxc/image.go:166
+#: lxc/image.go:165
 msgid "Copy aliases from source"
 msgstr "ソースからエイリアスをコピーしました"
 
 #: lxc/copy.go:24
+#, fuzzy
 msgid ""
-"Copy containers within or in between lxd instances.\n"
+"Copy containers within or in between LXD instances.\n"
 "\n"
-"lxc copy [remote:]<source container> [[remote:]<destination container>] [--"
+"lxc copy [<remote>:]<source>[/<snapshot>] [[<remote>:]<destination>] [--"
 "ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
 msgstr ""
 "LXDインスタンス内もしくはLXDインスタンス間でコンテナをコピーします。\n"
@@ -263,20 +271,26 @@ msgstr ""
 "lxc copy [remote:]<source container> [remote:]<destination container>\n"
 "[--ephemeral|e] [--profile|-p <profile>...] [--config|-c <key=value>...]"
 
-#: lxc/image.go:280
+#: lxc/image.go:278
 #, c-format
 msgid "Copying the image: %s"
 msgstr "イメージのコピー中: %s"
 
-#: lxc/remote.go:233
+#: lxc/remote.go:232
 msgid "Could not create server cert dir"
 msgstr "サーバ証明書格納用のディレクトリを作成できません。"
 
+#: lxc/file.go:83
+#, c-format
+msgid "Could not sanitize path %s"
+msgstr ""
+
 #: lxc/snapshot.go:21
+#, fuzzy
 msgid ""
 "Create a read-only snapshot of a container.\n"
 "\n"
-"lxc snapshot [remote:]<source> <snapshot name> [--stateful]\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"
@@ -289,7 +303,7 @@ msgid ""
 "successfully).\n"
 "\n"
 "Example:\n"
-"lxc snapshot u1 snap0"
+"    lxc snapshot u1 snap0"
 msgstr ""
 "コンテナの読み取り専用のスナップショットを作成します。\n"
 "\n"
@@ -304,16 +318,16 @@ msgstr ""
 "例:\n"
 "lxc snapshot u1 snap0"
 
-#: lxc/file.go:60 lxc/file.go:61
+#: lxc/file.go:59 lxc/file.go:60
 msgid "Create any directories necessary"
 msgstr "必要なディレクトリをすべて作成します"
 
-#: lxc/image.go:353 lxc/info.go:95
+#: lxc/image.go:350 lxc/info.go:95
 #, c-format
 msgid "Created: %s"
 msgstr "作成日時: %s"
 
-#: lxc/init.go:180 lxc/launch.go:134
+#: lxc/init.go:180 lxc/launch.go:135
 #, c-format
 msgid "Creating %s"
 msgstr "%s を作成中"
@@ -322,7 +336,7 @@ msgstr "%s を作成中"
 msgid "Creating the container"
 msgstr "コンテナを作成中"
 
-#: lxc/image.go:641 lxc/image.go:682
+#: lxc/image.go:638 lxc/image.go:679
 msgid "DESCRIPTION"
 msgstr ""
 
@@ -331,10 +345,11 @@ msgid "Define a compression algorithm: for image or none"
 msgstr "圧縮アルゴリズムを指定します: 圧縮アルゴリズム名 or none"
 
 #: lxc/delete.go:25
+#, fuzzy
 msgid ""
-"Delete containers or container snapshots.\n"
+"Delete containers or snapshots.\n"
 "\n"
-"lxc delete [remote:]<container>[/<snapshot>] [remote:][<container>[/"
+"lxc delete [<remote>:]<container>[/<snapshot>] [[<remote>:]<container>[/"
 "<snapshot>]...]\n"
 "\n"
 "Destroy containers or snapshots with any attached data (configuration, "
@@ -367,13 +382,20 @@ msgid "EXPIRY DATE"
 msgstr ""
 
 #: lxc/main.go:41
-msgid "Enables debug mode."
+#, fuzzy
+msgid "Enable debug mode"
 msgstr "デバッグモードを有効にします。"
 
 #: lxc/main.go:40
-msgid "Enables verbose mode."
+#, fuzzy
+msgid "Enable verbose mode"
 msgstr "詳細モードを有効にします。"
 
+#: lxc/exec.go:54
+#, fuzzy
+msgid "Environment variable to set (e.g. HOME=/home/foo)"
+msgstr "環境変数を HOME=/home/foo の形式で指定します"
+
 #: lxc/help.go:69
 msgid "Environment:"
 msgstr "環境変数:"
@@ -388,32 +410,34 @@ msgid "Event type to listen for"
 msgstr "Listenするイベントタイプ"
 
 #: lxc/exec.go:45
+#, fuzzy
 msgid ""
 "Execute the specified command in a container.\n"
 "\n"
-"lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env "
-"EDITOR=/usr/bin/vim]... [--] <command line>\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 EDITOR=/usr/bin/vim]... [--] <command line>\n"
+"lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env "
+"EDITOR=/usr/bin/vim]... [--] <command line>\n"
 "\n"
 "デフォルトのモードは non-interactive です。もし標準入出力が両方ともターミナ\n"
 "ルの場合は interactive モードが選択されます (標準エラー出力は無視されます)。"
 
-#: lxc/image.go:357
+#: lxc/image.go:354
 #, c-format
 msgid "Expires: %s"
 msgstr "失効日時: %s"
 
-#: lxc/image.go:359
+#: lxc/image.go:356
 msgid "Expires: never"
 msgstr "失効日時: 失効しない"
 
-#: lxc/config.go:272 lxc/image.go:639 lxc/image.go:681
+#: lxc/config.go:272 lxc/image.go:636 lxc/image.go:678
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -421,41 +445,45 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt"
 msgstr "Fast モード (--columns=nsacPt と同じ)"
 
-#: lxc/image.go:346
+#: lxc/image.go:343
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
 
-#: lxc/finger.go:15
-msgid ""
-"Fingers the LXD instance to check if it is up and working.\n"
-"\n"
-"lxc finger <remote>"
-msgstr ""
-"LXDインスタンスが稼働中かを確認します。\n"
-"\n"
-"lxc finger <remote>"
-
 #: lxc/action.go:42 lxc/action.go:43
-msgid "Force the container to shutdown."
+#, fuzzy
+msgid "Force the container to shutdown"
 msgstr "コンテナを強制シャットダウンします。"
 
 #: lxc/delete.go:34 lxc/delete.go:35
-msgid "Force the removal of stopped containers."
+#, fuzzy
+msgid "Force the removal of stopped containers"
 msgstr "停止したコンテナを強制的に削除します。"
 
 #: lxc/main.go:42
-msgid "Force using the local unix socket."
+#, fuzzy
+msgid "Force using the local unix socket"
 msgstr "強制的にローカルのUNIXソケットを使います。"
 
-#: lxc/image.go:169 lxc/list.go:123
+#: lxc/image.go:168 lxc/list.go:123
 msgid "Format"
 msgstr ""
 
-#: lxc/remote.go:66
+#: lxc/remote.go:65
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "クライアント証明書を生成します。1分ぐらいかかります..."
 
+#: lxc/help.go:25
+#, fuzzy
+msgid ""
+"Help page for the LXD client.\n"
+"\n"
+"lxc help [--all]"
+msgstr ""
+"LXDの使い方の詳細を表示します。\n"
+"\n"
+"lxd help [--all]"
+
 #: lxc/list.go:423
 msgid "IPV4"
 msgstr ""
@@ -474,33 +502,36 @@ msgid ""
 msgstr "初めて LXD を使う場合、sudo lxd init と実行する必要があります"
 
 #: lxc/main.go:43
-msgid "Ignore aliases when determining what command to run."
+#, fuzzy
+msgid "Ignore aliases when determining what command to run"
 msgstr "どのコマンドを実行するか決める際にエイリアスを無視します。"
 
 #: lxc/action.go:46
-msgid "Ignore the container state (only for start)."
+#, fuzzy
+msgid "Ignore the container state (only for start)"
 msgstr "コンテナの状態を無視します (startのみ)。"
 
-#: lxc/image.go:285
+#: lxc/image.go:281
 msgid "Image copied successfully!"
 msgstr "イメージのコピーが成功しました!"
 
-#: lxc/image.go:442
+#: lxc/image.go:421 lxc/image.go:433
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "イメージは以下のフィンガープリントでインポートされました: %s"
 
-#: lxc/image.go:429
+#: lxc/image.go:418
 #, c-format
 msgid "Importing the image: %s"
 msgstr "イメージのインポート中: %s"
 
 #: lxc/init.go:74
+#, 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>]\n"
+"lxc init [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--profile|-"
+"p <profile>...] [--config|-c <key=value>...] [--network|-n <network>]\n"
 "\n"
 "Initializes a container using the specified image and name.\n"
 "\n"
@@ -508,11 +539,12 @@ msgid ""
 "Specifying \"-p\" with no argument will result in no profile.\n"
 "\n"
 "Example:\n"
-"lxc init ubuntu u1"
+"    lxc init ubuntu u1"
 msgstr ""
 "指定したイメージからコンテナを初期化します。\n"
 "\n"
-"lxc init [remote:]<image> [remote:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n <network>]\n"
+"lxc init [remote:]<image> [remote:][<name>] [--ephemeral|-e] [--profile|-p "
+"<profile>...] [--config|-c <key=value>...] [--network|-n <network>]\n"
 "\n"
 "指定したイメージとコンテナ名を使ってコンテナを初期化します。\n"
 "\n"
@@ -522,7 +554,7 @@ msgstr ""
 "例:\n"
 "lxc init ubuntu u1"
 
-#: lxc/remote.go:136
+#: lxc/remote.go:135
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr "不正な URL スキーム \"%s\" (\"%s\" 内)"
@@ -535,12 +567,12 @@ msgstr "不正な証明書です"
 msgid "Invalid configuration key"
 msgstr "正しくない設定項目 (key) です"
 
-#: lxc/file.go:247
+#: lxc/file.go:249
 #, c-format
 msgid "Invalid source %s"
 msgstr "不正なソース %s"
 
-#: lxc/file.go:73
+#: lxc/file.go:72
 #, c-format
 msgid "Invalid target %s"
 msgstr "不正な送り先 %s"
@@ -549,7 +581,7 @@ msgstr "不正な送り先 %s"
 msgid "Ips:"
 msgstr "IPアドレス:"
 
-#: lxc/image.go:167
+#: lxc/image.go:166
 msgid "Keep the image up to date after initial copy"
 msgstr "最初にコピーした後も常にイメージを最新の状態に保つ"
 
@@ -562,11 +594,13 @@ msgid "LXD socket not found; is LXD installed and running?"
 msgstr "LXD のソケットが見つかりません。LXD が実行されていますか?"
 
 #: lxc/launch.go:22
+#, 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>]\n"
+"lxc launch [<remote>:]<image> [<remote>:][<name>] [--ephemeral|-e] [--"
+"profile|-p <profile>...] [--config|-c <key=value>...] [--network|-n "
+"<network>]\n"
 "\n"
 "Launches a container using the specified image and name.\n"
 "\n"
@@ -574,11 +608,12 @@ msgid ""
 "Specifying \"-p\" with no argument will result in no profile.\n"
 "\n"
 "Example:\n"
-"lxc launch ubuntu:16.04 u1"
+"    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>]\n"
+"lxc launch [remote:]<image> [remote:][<name>] [--ephemeral|-e] [--profile|-p "
+"<profile>...] [--config|-c <key=value>...] [--network|-n <network>]\n"
 "\n"
 "指定したイメージと名前を使ってコンテナを起動します。\n"
 "\n"
@@ -589,14 +624,15 @@ msgstr ""
 "lxc launch ubuntu:16.04 u1"
 
 #: 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"
+"    lxc info [<remote:>]<container> [--show-log]\n"
 "\n"
 "For a server:\n"
-" lxc info [<remote>:]"
+"    lxc info [<remote:>]"
 msgstr ""
 "LXD サーバとコンテナの情報を一覧表示します。\n"
 "\n"
@@ -607,10 +643,12 @@ msgstr ""
 " lxc info [<remote>:]"
 
 #: lxc/list.go:68
+#, fuzzy
 msgid ""
-"Lists the available resources.\n"
+"Lists the containers.\n"
 "\n"
-"lxc list [resource] [filters] [--format table|json] [-c columns] [--fast]\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 "
@@ -659,20 +697,24 @@ msgid ""
 "Default column layout: ns46tS\n"
 "Fast column layout: nsacPt\n"
 "\n"
-"Example: lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile."
-"eth0.hwaddr:MAC\n"
+"Example:\n"
+"    lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0."
+"hwaddr:MAC"
 msgstr ""
 "利用可能なリソースを一覧表示します。\n"
 "\n"
 "lxc list [resource] [filters] [--format table|json] [-c columns] [--fast]\n"
 "\n"
 "フィルタの指定:\n"
-"* 単一の \"web\" のようなキーワードを指定すると、名前が \"web\" ではじまるコンテ\n"
+"* 単一の \"web\" のようなキーワードを指定すると、名前が \"web\" ではじまるコ"
+"ンテ\n"
 "  ナが一覧表示されます。\n"
 "* コンテナ名の正規表現 (例: .*web.*01$)\n"
-"* 設定項目のキーと値。キーの名前空間は一意に識別できる場合は短縮することがで\n"
+"* 設定項目のキーと値。キーの名前空間は一意に識別できる場合は短縮することが"
+"で\n"
 "  きます:\n"
-" * \"user.blah=abc\" は \"blah\" という user プロパティが \"abc\" に設定されている\n"
+" * \"user.blah=abc\" は \"blah\" という user プロパティが \"abc\" に設定され"
+"ている\n"
 "  コンテナをすべて一覧表示します。\n"
 " * \"u.blah=abc\" は上記と同じ意味になります。\n"
 " * \"security.privileged=1\" は特権コンテナをすべて一覧表示します。\n"
@@ -713,17 +755,18 @@ msgstr ""
 "Fast モードのカラムレイアウト: nsacPt\n"
 "\n"
 "例:\n"
-"lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:MAC\n"
+"lxc list -c n,volatile.base_image:\"BASE IMAGE\":0,s46,volatile.eth0.hwaddr:"
+"MAC\n"
 
 #: lxc/info.go:239
 msgid "Log:"
 msgstr "ログ:"
 
-#: lxc/network.go:424
+#: lxc/network.go:423
 msgid "MANAGED"
 msgstr ""
 
-#: lxc/image.go:165
+#: lxc/image.go:164
 msgid "Make image public"
 msgstr "イメージを public にする"
 
@@ -732,25 +775,33 @@ msgid "Make the image public"
 msgstr "イメージを public にする"
 
 #: lxc/profile.go:48
+#, fuzzy
 msgid ""
 "Manage configuration profiles.\n"
 "\n"
-"lxc profile list [filters]                     List available profiles.\n"
-"lxc profile show <profile>                     Show details of a profile.\n"
-"lxc profile create <profile>                   Create a profile.\n"
-"lxc profile copy <profile> <remote>            Copy the profile to the "
-"specified remote.\n"
-"lxc profile get <profile> <key>                Get profile configuration.\n"
-"lxc profile set <profile> <key> <value>        Set profile configuration.\n"
-"lxc profile unset <profile> <key>              Unset profile configuration.\n"
-"lxc profile delete <profile>                   Delete a profile.\n"
-"lxc profile edit <profile>\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 <container> <profiles>\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 "
@@ -762,27 +813,27 @@ msgid ""
 "             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 <container> <profile> # add a profile to a container\n"
-"lxc profile remove <container> <profile> # remove the profile from a "
+"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 <profile>                                   List "
-"devices in the given profile.\n"
-"lxc profile device show <profile>                                   Show "
-"full device details in the given profile.\n"
-"lxc profile device remove <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 <profile name> <device name> <device type> "
-"[key=value]...\n"
-"    Add a profile device, such as a disk or a nic, to the containers\n"
-"    using the specified profile."
+"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 ""
 "設定プロファイルを管理します。\n"
 "\n"
@@ -805,12 +856,14 @@ msgstr ""
 "lxc profile edit <profile>\n"
 "    プロファイルを編集します。外部エディタもしくはSTDINから読み込みます。\n"
 "    例: lxc profile edit <profile> # エディタの起動\n"
-"        cat profile.yaml | lxc profile edit <profile> # profile.yaml から読み込み\n"
+"        cat profile.yaml | lxc profile edit <profile> # profile.yaml から読み"
+"込み\n"
 "\n"
 "lxc profile assign <container> <profiles>\n"
 "    プロファイルのコンマ区切りのリストをコンテナに順番に割り当てます。\n"
 "    このコマンドで指定したプロファイルだけが対象のコンテナに適用されます。\n"
-"    つまり、コマンドで指定したコンテナに正確にプロファイルのリストを設定します。\n"
+"    つまり、コマンドで指定したコンテナに正確にプロファイルのリストを設定しま"
+"す。\n"
 "    コンテナから特定のプロファイルを追加したり削除したりするには、この\n"
 "    後の {add|remove} を使います。\n"
 "    例: lxc profile assign foo default,bar # defaultとbarを適用\n"
@@ -835,59 +888,68 @@ msgstr ""
 "    デバイスプロパティを設定します\n"
 "lxc profile device unset <[remote:]profile> <name> <key>\n"
 "    デバイスプロパティを削除します\n"
-"lxc profile device add <profile name> <device name> <device type> [key=value]...\n"
+"lxc profile device add <profile name> <device name> <device type> "
+"[key=value]...\n"
 "    ディスクやNICのようなプロファイルデバイスを指定したプロファイルを使って\n"
 "    コンテナに追加します。"
 
 #: lxc/config.go:57
+#, fuzzy
 msgid ""
 "Manage configuration.\n"
 "\n"
-"lxc config device add <[remote:]container> <name> <type> [key=value]...     "
-"Add a device to a container.\n"
-"lxc config device get <[remote:]container> <name> <key>                     "
-"Get a device property.\n"
-"lxc config device set <[remote:]container> <name> <key> <value>             "
-"Set a device property.\n"
-"lxc config device unset <[remote:]container> <name> <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"
+"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 <config> # read from config."
-"yaml\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"
+"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=/"
+"    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 = "
+"    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 "
@@ -924,9 +986,11 @@ msgstr ""
 "    コンテナもしくはサーバの設定を表示します。\n"
 "lxc config edit [remote:][container]\n"
 "    コンテナもしくはサーバの設定を外部エディタで編集します。\n"
-"    設定の編集は外部エディタを起動するか、標準入力からの読み込みで行います。\n"
+"    設定の編集は外部エディタを起動するか、標準入力からの読み込みで行いま"
+"す。\n"
 "    例: lxc config edit <container> # エディタの起動\n"
-"        cat config.yaml | lxc config edit <config> # config.yamlから読み込み\n"
+"        cat config.yaml | lxc config edit <config> # config.yamlから読み込"
+"み\n"
 "\n"
 "lxc config trust list [remote]\n"
 "    信頼する証明書を全て表示します。\n"
@@ -937,10 +1001,12 @@ msgstr ""
 "\n"
 "例:\n"
 "ホストの /share/c1 をコンテナ内の /opt にマウントするには:\n"
-"    lxc config device add [remote:]container1 <device-name> disk source=/share/c1 path=opt\n"
+"    lxc config device add [remote:]container1 <device-name> disk source=/"
+"share/c1 path=opt\n"
 "\n"
 "lxc 設定項目に値を設定するには:\n"
-"    lxc config set [remote:]<container> raw.lxc 'lxc.aa_allow_incomplete = 1'\n"
+"    lxc config set [remote:]<container> raw.lxc 'lxc.aa_allow_incomplete = "
+"1'\n"
 "\n"
 "IPv4 と IPv6 のポート 8443 で Listen するには\n"
 "(8443 はデフォルトなので省略できます):\n"
@@ -949,30 +1015,32 @@ msgstr ""
 "サーバのパスワードを設定するには:\n"
 "    lxc config set core.trust_password blah"
 
-#: lxc/file.go:35
+#: lxc/file.go:36
+#, fuzzy
 msgid ""
-"Manage files on a container.\n"
+"Manage files in a container.\n"
 "\n"
-"lxc file pull [-r|--recursive] <source> [<source>...] <target>\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> [<source>...] <target>\n"
-"lxc file edit <file>\n"
+"mode=MODE] <source path> [<source path>...] [<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"
-"\n"
 "To push /etc/hosts into the container foo:\n"
-"  lxc file push /etc/hosts foo/etc/hosts\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 .\n"
+"    lxc file pull foo/etc/hosts ."
 msgstr ""
 "コンテナ上のファイルを管理します。\n"
 "\n"
 "lxc file pull [-r|--recursive] <source> [<source>...] <target>\n"
-"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--mode=MODE] <source> [<source>...] <target>\n"
+"lxc file push [-r|--recursive] [-p|--create-dirs] [--uid=UID] [--gid=GID] [--"
+"mode=MODE] <source> [<source>...] <target>\n"
 "lxc file edit <file>\n"
 "\n"
 "pull の場合の <source>、push の場合の <target>、edit の場合の <file> は、い\n"
@@ -987,41 +1055,52 @@ msgstr ""
 "  lxc file pull foo/etc/hosts\n"
 
 #: lxc/network.go:48
+#, fuzzy
 msgid ""
 "Manage networks.\n"
 "\n"
-"lxc network list                               List available networks.\n"
-"lxc network show <network>                     Show details of a network.\n"
-"lxc network create <network> [key=value]...    Create a network.\n"
-"lxc network get <network> <key>                Get network configuration.\n"
-"lxc network set <network> <key> <value>        Set network configuration.\n"
-"lxc network unset <network> <key>              Unset network configuration.\n"
-"lxc network delete <network>                   Delete a network.\n"
-"lxc network edit <network>\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 <network> <container> [device name]\n"
-"lxc network attach-profile <network> <profile> [device name]\n"
+"lxc network attach [<remote>:]<network> <container> [device name]\n"
+"lxc network attach-profile [<remote>:]<network> <profile> [device name]\n"
 "\n"
-"lxc network detach <network> <container> [device name]\n"
-"lxc network detach-profile <network> <container> [device name]\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                                利用できるネットワークを一覧します\n"
-"lxc network show <network>                      ネットワークの詳細を表示します\n"
+"lxc network list                                利用できるネットワークを一覧"
+"します\n"
+"lxc network show <network>                      ネットワークの詳細を表示しま"
+"す\n"
 "lxc network create <network> [key=value]...     ネットワークを作成します\n"
-"lxc network get <network> <key>                 ネットワークの設定を取得します\n"
+"lxc network get <network> <key>                 ネットワークの設定を取得しま"
+"す\n"
 "lxc network set <network> <key> <value>         ネットワークを設定します\n"
-"lxc network unset <network> <key>               ネットワークの設定を削除します\n"
+"lxc network unset <network> <key>               ネットワークの設定を削除しま"
+"す\n"
 "lxc network delete <network>                    ネットワークを削除します\n"
 "lxc network edit <network>\n"
 "    ネットワークを編集します。外部エディタもしくはSTDINから読み込みます。\n"
 "    例: lxc network edit <network> # エディタの起動\n"
-"        cat network.yaml | lxc network edit <network> # network.yaml から読み込み\n"
+"        cat network.yaml | lxc network edit <network> # network.yaml から読み"
+"込み\n"
 "\n"
 "lxc network attach <network> <container> [device name]\n"
 "lxc network attach-profile <network> <profile> [device name]\n"
@@ -1029,23 +1108,24 @@ msgstr ""
 "lxc network detach <network> <container> [device name]\n"
 "lxc network detach-profile <network> <container> [device name]\n"
 
-#: lxc/remote.go:38
+#: lxc/remote.go:37
+#, fuzzy
 msgid ""
 "Manage remote LXD servers.\n"
 "\n"
-"lxc remote add [<name>] <IP|FQDN|URL> [--accept-certificate] [--"
+"lxc remote add [<remote>] <IP|FQDN|URL> [--accept-certificate] [--"
 "password=PASSWORD]\n"
-"                                      [--public] [--protocol=PROTOCOL]      "
+"                                        [--public] [--protocol=PROTOCOL]    "
 "Add the remote <name> at <url>.\n"
-"lxc remote remove <name>                                                    "
+"lxc remote remove <remote>                                                  "
 "Remove the remote <name>.\n"
 "lxc remote list                                                             "
 "List all remotes.\n"
-"lxc remote rename <old> <new>                                               "
+"lxc remote rename <old name> <new name>                                     "
 "Rename remote <old> to <new>.\n"
-"lxc remote set-url <name> <url>                                             "
+"lxc remote set-url <remote> <url>                                           "
 "Update <name>'s url to <url>.\n"
-"lxc remote set-default <name>                                               "
+"lxc remote set-default <remote>                                             "
 "Set the default remote.\n"
 "lxc remote get-default                                                      "
 "Print the default remote."
@@ -1070,6 +1150,7 @@ msgstr ""
 "    デフォルトに設定されているリモートホストを表示します。"
 
 #: lxc/image.go:95
+#, fuzzy
 msgid ""
 "Manipulate container images.\n"
 "\n"
@@ -1088,22 +1169,22 @@ msgid ""
 "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"
+"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"
+"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"
+"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"
+"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"
@@ -1115,31 +1196,31 @@ msgid ""
 "    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"
+"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"
+"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"
+"lxc image show [<remote>:]<image>\n"
 "    Yaml output of the user modifiable properties of an image.\n"
 "\n"
-"lxc image edit [remote:]<image>\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"
+"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"
+"lxc image alias delete [<remote>:]<alias>\n"
 "    Delete an alias.\n"
 "\n"
-"lxc image alias list [remote:] [filter]\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.\n"
+"image alias name."
 msgstr ""
 "コンテナイメージを操作します。\n"
 "\n"
@@ -1156,11 +1237,14 @@ msgstr ""
 "る場合は) エイリアスで参照できます。\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"
+"lxc image import <tarball> [rootfs tarball|URL] [remote:] [--public] [--"
+"created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] [--"
+"alias=ALIAS].. [prop=value]\n"
 "    イメージの tarball (複数も可能) を LXD のイメージストアにインポートしま\n"
 "    す。\n"
 "\n"
-"lxc image copy [remote:]<image> <remote>: [--alias=ALIAS].. [--copy-aliases] [--public] [--auto-update]\n"
+"lxc image copy [remote:]<image> <remote>: [--alias=ALIAS].. [--copy-aliases] "
+"[--public] [--auto-update]\n"
 "    ネットワーク経由である LXD デーモンから他の LXD デーモンへイメージを\n"
 "    コピーします。\n"
 "\n"
@@ -1206,7 +1290,8 @@ msgstr ""
 "    エイリアスを削除します。\n"
 "\n"
 "lxc image alias list [remote:] [filter]\n"
-"    エイリアスを一覧表示します。イメージハッシュの一部やイメージのエイリアス\n"
+"    エイリアスを一覧表示します。イメージハッシュの一部やイメージのエイリア"
+"ス\n"
 "    名の一部をフィルタとして指定できます。\n"
 
 #: lxc/info.go:161
@@ -1222,10 +1307,11 @@ msgid "Missing summary."
 msgstr "サマリーはありません。"
 
 #: lxc/monitor.go:41
+#, fuzzy
 msgid ""
 "Monitor activity on the LXD server.\n"
 "\n"
-"lxc monitor [remote:] [--type=TYPE...]\n"
+"lxc monitor [<remote>:] [--type=TYPE...]\n"
 "\n"
 "Connects to the monitoring interface of the specified LXD server.\n"
 "\n"
@@ -1233,7 +1319,7 @@ msgid ""
 "Specific types to listen to can be specified with --type.\n"
 "\n"
 "Example:\n"
-"lxc monitor --type=logging"
+"    lxc monitor --type=logging"
 msgstr ""
 "LXD サーバの動作をモニタリングします。\n"
 "\n"
@@ -1247,26 +1333,30 @@ msgstr ""
 "例:\n"
 "lxc monitor --type=logging"
 
-#: lxc/network.go:216 lxc/network.go:265
+#: lxc/network.go:215 lxc/network.go:264
 msgid "More than one device matches, specify the device name."
 msgstr "複数のデバイスとマッチします。デバイス名を指定してください。"
 
-#: lxc/file.go:235
+#: lxc/file.go:237
 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"
 "\n"
-"lxc move [remote:]<source container> [remote:]<destination container>\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 ""
 "LXD ホスト内、もしくは LXD ホスト間でコンテナを移動します。\n"
 "\n"
@@ -1281,11 +1371,11 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "コンテナ名を指定する必要があります: "
 
-#: lxc/list.go:428 lxc/network.go:422 lxc/profile.go:447 lxc/remote.go:381
+#: lxc/list.go:428 lxc/network.go:421 lxc/profile.go:446 lxc/remote.go:380
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:408 lxc/remote.go:355 lxc/remote.go:360
+#: lxc/network.go:407 lxc/remote.go:354 lxc/remote.go:359
 msgid "NO"
 msgstr ""
 
@@ -1294,12 +1384,12 @@ msgstr ""
 msgid "Name: %s"
 msgstr "コンテナ名: %s"
 
-#: lxc/network.go:190
+#: lxc/network.go:189
 #, c-format
 msgid "Network %s created"
 msgstr "ネットワーク %s を作成しました"
 
-#: lxc/network.go:293
+#: lxc/network.go:292
 #, c-format
 msgid "Network %s deleted"
 msgstr "ネットワーク %s を削除しました"
@@ -1308,7 +1398,7 @@ msgstr "ネットワーク %s を削除しました"
 msgid "Network name"
 msgstr "ネットワーク名:"
 
-#: lxc/image.go:168 lxc/publish.go:34
+#: lxc/image.go:167 lxc/publish.go:34
 msgid "New alias to define at target"
 msgstr "新しいエイリアスを定義する"
 
@@ -1316,7 +1406,7 @@ msgstr "新しいエイリアスを定義する"
 msgid "No certificate provided to add"
 msgstr "追加すべき証明書が提供されていません"
 
-#: lxc/network.go:225 lxc/network.go:274
+#: lxc/network.go:224 lxc/network.go:273
 msgid "No device found for this network"
 msgstr "このネットワークに対するデバイスがありません"
 
@@ -1324,11 +1414,11 @@ msgstr "このネットワークに対するデバイスがありません"
 msgid "No fingerprint specified."
 msgstr "フィンガープリントが指定されていません。"
 
-#: lxc/remote.go:121
+#: lxc/remote.go:120
 msgid "Only https URLs are supported for simplestreams"
 msgstr "simplestreams は https の URL のみサポートします"
 
-#: lxc/image.go:434
+#: lxc/image.go:424
 msgid "Only https:// is supported for remote image import."
 msgstr "リモートイメージのインポートは https:// のみをサポートします。"
 
@@ -1336,7 +1426,7 @@ msgstr "リモートイメージのインポートは https:// のみをサポ
 msgid "Options:"
 msgstr "オプション:"
 
-#: lxc/image.go:538
+#: lxc/image.go:535
 #, c-format
 msgid "Output is in %s"
 msgstr "%s に出力されます"
@@ -1357,11 +1447,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:383
+#: lxc/remote.go:382
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:640 lxc/remote.go:384
+#: lxc/image.go:637 lxc/remote.go:383
 msgid "PUBLIC"
 msgstr ""
 
@@ -1374,11 +1464,13 @@ msgid "Packets sent"
 msgstr "送信パケット"
 
 #: lxc/help.go:70
-msgid "Path to an alternate client configuration directory."
+#, fuzzy
+msgid "Path to an alternate client configuration directory"
 msgstr "別のクライアント用設定ディレクトリ"
 
 #: lxc/help.go:71
-msgid "Path to an alternate server directory."
+#, fuzzy
+msgid "Path to an alternate server directory"
 msgstr "別のサーバ用設定ディレクトリ"
 
 #: lxc/main.go:31
@@ -1390,40 +1482,34 @@ msgstr "アクセスが拒否されました。lxd グループに所属して
 msgid "Pid: %d"
 msgstr ""
 
-#: lxc/help.go:25
-msgid ""
-"Presents details on how to use LXD.\n"
-"\n"
-"lxd help [--all]"
-msgstr ""
-"LXDの使い方の詳細を表示します。\n"
-"\n"
-"lxd help [--all]"
-
-#: lxc/network.go:343 lxc/profile.go:219
+#: lxc/network.go:342 lxc/profile.go:218
 msgid "Press enter to open the editor again"
 msgstr "再度エディタを開くためには Enter キーを押します"
 
-#: lxc/config.go:531 lxc/config.go:596 lxc/image.go:735
+#: lxc/config.go:531 lxc/config.go:596 lxc/image.go:732
 msgid "Press enter to start the editor again"
 msgstr "再度エディタを起動するには Enter キーを押します"
 
+#: lxc/manpage.go:18
+#, fuzzy
+msgid "Print all the subcommands help."
+msgstr "全てのサブコマンドのヘルプを表示します。"
+
 #: lxc/help.go:65
-msgid "Print debug information."
+#, fuzzy
+msgid "Print debug information"
 msgstr "デバッグ情報を表示します。"
 
 #: lxc/help.go:64
-msgid "Print less common commands."
+#, fuzzy
+msgid "Print less common commands"
 msgstr "全てのコマンドを表示します (主なコマンドだけではなく)。"
 
 #: lxc/help.go:66
-msgid "Print verbose information."
+#, fuzzy
+msgid "Print verbose information"
 msgstr "詳細情報を表示します。"
 
-#: lxc/manpage.go:18
-msgid "Prints all the subcommands help."
-msgstr "全てのサブコマンドのヘルプを表示します。"
-
 #: lxc/version.go:18
 msgid ""
 "Prints the version number of this client tool.\n"
@@ -1439,22 +1525,22 @@ msgstr ""
 msgid "Processes: %d"
 msgstr "プロセス数: %d"
 
-#: lxc/profile.go:275
+#: lxc/profile.go:274
 #, c-format
 msgid "Profile %s added to %s"
 msgstr "プロファイル %s が %s に追加されました"
 
-#: lxc/profile.go:170
+#: lxc/profile.go:169
 #, c-format
 msgid "Profile %s created"
 msgstr "プロファイル %s を作成しました"
 
-#: lxc/profile.go:240
+#: lxc/profile.go:239
 #, c-format
 msgid "Profile %s deleted"
 msgstr "プロファイル %s を削除しました"
 
-#: lxc/profile.go:306
+#: lxc/profile.go:305
 #, c-format
 msgid "Profile %s removed from %s"
 msgstr "プロファイル %s が %s から削除されました"
@@ -1464,7 +1550,7 @@ msgstr "プロファイル %s が %s から削除されました"
 msgid "Profile to apply to the new container"
 msgstr "新しいコンテナに適用するプロファイル"
 
-#: lxc/profile.go:256
+#: lxc/profile.go:255
 #, c-format
 msgid "Profiles %s applied to %s"
 msgstr "プロファイル %s が %s に追加されました"
@@ -1474,36 +1560,37 @@ msgstr "プロファイル %s が %s に追加されました"
 msgid "Profiles: %s"
 msgstr "プロファイル: %s"
 
-#: lxc/image.go:361
+#: lxc/image.go:358
 msgid "Properties:"
 msgstr "プロパティ:"
 
-#: lxc/remote.go:55
+#: lxc/remote.go:54
 msgid "Public image server"
 msgstr "Public なイメージサーバとして設定します"
 
-#: lxc/image.go:349
+#: lxc/image.go:346
 #, c-format
 msgid "Public: %s"
 msgstr ""
 
 #: lxc/publish.go:26
+#, fuzzy
 msgid ""
 "Publish containers as images.\n"
 "\n"
-"lxc publish [remote:]container [remote:] [--alias=ALIAS]... [prop-key=prop-"
-"value]..."
+"lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
+"alias=ALIAS...] [prop-key=prop-value...]"
 msgstr ""
 "イメージとしてコンテナを publish します。\n"
 "\n"
 "lxc publish [remote:]container [remote:] [--alias=ALIAS]... [prop-key=prop-"
 "value]..."
 
-#: lxc/file.go:58 lxc/file.go:59
+#: lxc/file.go:57 lxc/file.go:58
 msgid "Recursively push or pull files"
 msgstr "再帰的にファイルをpush/pullします"
 
-#: lxc/remote.go:53
+#: lxc/remote.go:52
 msgid "Remote admin password"
 msgstr "リモートの管理者パスワード"
 
@@ -1518,19 +1605,48 @@ msgid "Remove %s (yes/no): "
 msgstr "%s を消去しますか (yes/no): "
 
 #: lxc/delete.go:36 lxc/delete.go:37
-msgid "Require user confirmation."
+#, fuzzy
+msgid "Require user confirmation"
 msgstr "ユーザの確認を要求する。"
 
 #: lxc/info.go:127
 msgid "Resources:"
 msgstr "リソース:"
 
-#: lxc/init.go:267
+#: lxc/restore.go:21
+#, fuzzy
+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 ""
+"リソースの現在の状態をスナップショット時点の状態に設定します。\n"
+"\n"
+"lxc restore [remote:]<container> <snapshot name> [--stateful]\n"
+"\n"
+"スナップショットからコンテナをリストアします (オプションで実行状態もリスト\n"
+"アします。詳しくはスナップショットのヘルプをご覧ください)。\n"
+"\n"
+"例:\n"
+"lxc snapshot u1 snap0 # スナップショットの作成\n"
+"lxc restore u1 snap0 # スナップショットからリストア"
+
+#: lxc/init.go:239
 #, c-format
 msgid "Retrieving image: %s"
 msgstr "イメージの取得中: %s"
 
-#: lxc/image.go:643
+#: lxc/image.go:640
 msgid "SIZE"
 msgstr ""
 
@@ -1542,55 +1658,31 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:385
+#: lxc/remote.go:384
 msgid "STATIC"
 msgstr ""
 
-#: lxc/remote.go:226
+#: lxc/remote.go:225
 msgid "Server certificate NACKed by user"
 msgstr "ユーザによりサーバ証明書が拒否されました"
 
-#: lxc/remote.go:288
+#: lxc/remote.go:287
 msgid "Server doesn't trust us after adding our cert"
 msgstr "サーバが我々の証明書を追加した後我々を信頼していません"
 
-#: lxc/remote.go:54
+#: lxc/remote.go:53
 msgid "Server protocol (lxd or simplestreams)"
 msgstr "サーバのプロトコル (lxd or simplestreams)"
 
-#: lxc/restore.go:21
-msgid ""
-"Set the current state of a resource back to a snapshot.\n"
-"\n"
-"lxc restore [remote:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"Restores a container from a snapshot (optionally with running state, see\n"
-"snapshot help for details).\n"
-"\n"
-"For example:\n"
-"lxc snapshot u1 snap0 # create the snapshot\n"
-"lxc restore u1 snap0 # restore the snapshot"
-msgstr ""
-"リソースの現在の状態をスナップショット時点の状態に設定します。\n"
-"\n"
-"lxc restore [remote:]<container> <snapshot name> [--stateful]\n"
-"\n"
-"スナップショットからコンテナをリストアします (オプションで実行状態もリスト\n"
-"アします。詳しくはスナップショットのヘルプをご覧ください)。\n"
-"\n"
-"例:\n"
-"lxc snapshot u1 snap0 # スナップショットの作成\n"
-"lxc restore u1 snap0 # スナップショットからリストア"
-
-#: lxc/file.go:56
+#: lxc/file.go:55
 msgid "Set the file's gid on push"
 msgstr "プッシュ時にファイルのgidを設定します"
 
-#: lxc/file.go:57
+#: lxc/file.go:56
 msgid "Set the file's perms on push"
 msgstr "プッシュ時にファイルのパーミションを設定します"
 
-#: lxc/file.go:55
+#: lxc/file.go:54
 msgid "Set the file's uid on push"
 msgstr "プッシュ時にファイルのuidを設定します"
 
@@ -1599,14 +1691,20 @@ msgid "Show all commands (not just interesting ones)"
 msgstr "全てコマンドを表示します (主なコマンドだけではなく)"
 
 #: lxc/help.go:67
-msgid "Show client version."
+#, fuzzy
+msgid "Show client version"
 msgstr "クライアントのバージョンを表示します。"
 
 #: lxc/info.go:36
 msgid "Show the container's last 100 log lines?"
 msgstr "コンテナログの最後の 100 行を表示しますか?"
 
-#: lxc/image.go:347
+#: lxc/config.go:32
+#, fuzzy
+msgid "Show the expanded configuration"
+msgstr "拡張した設定を表示するかどうか"
+
+#: lxc/image.go:344
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "サイズ: %.2fMB"
@@ -1615,11 +1713,11 @@ msgstr "サイズ: %.2fMB"
 msgid "Snapshots:"
 msgstr "スナップショット:"
 
-#: lxc/image.go:371
+#: lxc/image.go:368
 msgid "Source:"
 msgstr "取得元:"
 
-#: lxc/launch.go:142
+#: lxc/launch.go:144
 #, c-format
 msgid "Starting %s"
 msgstr "%s を起動中"
@@ -1638,7 +1736,8 @@ msgid "Stopping container failed!"
 msgstr "コンテナの停止に失敗しました!"
 
 #: lxc/action.go:45
-msgid "Store the container state (only for stop)."
+#, fuzzy
+msgid "Store the container state (only for stop)"
 msgstr "コンテナの状態を保存します (stopのみ)。"
 
 #: lxc/info.go:169
@@ -1649,7 +1748,7 @@ msgstr "Swap (現在値)"
 msgid "Swap (peak)"
 msgstr "Swap (ピーク)"
 
-#: lxc/list.go:433 lxc/network.go:423
+#: lxc/list.go:433 lxc/network.go:422
 msgid "TYPE"
 msgstr ""
 
@@ -1665,8 +1764,9 @@ msgstr ""
 "コンテナは現在実行中です。停止して、再起動するために --force を使用してくだ\n"
 "さい。"
 
-#: lxc/init.go:313
-msgid "The container you are starting doesn’t have any network attached to it."
+#: lxc/init.go:312
+#, fuzzy
+msgid "The container you are starting doesn't have any network attached to it."
 msgstr "起動しようとしたコンテナに接続されているネットワークがありません。"
 
 #: lxc/config.go:675 lxc/config.go:687 lxc/config.go:720 lxc/config.go:738
@@ -1674,7 +1774,7 @@ msgstr "起動しようとしたコンテナに接続されているネットワ
 msgid "The device doesn't exist"
 msgstr "デバイスが存在しません"
 
-#: lxc/init.go:297
+#: lxc/init.go:296
 #, c-format
 msgid "The local image '%s' couldn't be found, trying '%s:' instead."
 msgstr ""
@@ -1684,11 +1784,11 @@ msgstr ""
 msgid "The opposite of `lxc pause` is `lxc start`."
 msgstr "`lxc pause` の反対のコマンドは `lxc start` です。"
 
-#: lxc/network.go:230 lxc/network.go:279
+#: lxc/network.go:229 lxc/network.go:278
 msgid "The specified device doesn't exist"
 msgstr "指定したデバイスが存在しません"
 
-#: lxc/network.go:234 lxc/network.go:283
+#: lxc/network.go:233 lxc/network.go:282
 msgid "The specified device doesn't match the network"
 msgstr "指定したデバイスはネットワークとマッチしません"
 
@@ -1700,20 +1800,23 @@ msgstr ""
 "さい。"
 
 #: lxc/action.go:41
-msgid "Time to wait for the container before killing it."
+#, fuzzy
+msgid "Time to wait for the container before killing it"
 msgstr "コンテナを強制停止するまでの時間"
 
-#: lxc/image.go:350
+#: lxc/image.go:347
 msgid "Timestamps:"
 msgstr "タイムスタンプ:"
 
-#: lxc/init.go:315
+#: lxc/init.go:314
 msgid "To attach a network to a container, use: lxc network attach"
-msgstr "コンテナにネットワークを接続するには、lxc network attach を使用してください。"
+msgstr ""
+"コンテナにネットワークを接続するには、lxc network attach を使用してください。"
 
-#: lxc/init.go:314
+#: lxc/init.go:313
 msgid "To create a new network, use: lxc network create"
-msgstr "新しいネットワークを作成するには、lxc network create を使用してください。"
+msgstr ""
+"新しいネットワークを作成するには、lxc network create を使用してください。"
 
 #: lxc/main.go:137
 msgid "To start your first container, try: lxc launch ubuntu:16.04"
@@ -1722,12 +1825,12 @@ msgstr ""
 "だ\n"
 "さい。"
 
-#: lxc/image.go:421
-#, c-format
-msgid "Transferring image: %d%%"
+#: lxc/image.go:426
+#, fuzzy, c-format
+msgid "Transferring image: %s"
 msgstr "イメージを転送中: %d%%"
 
-#: lxc/action.go:99 lxc/launch.go:155
+#: lxc/action.go:99 lxc/launch.go:157
 #, c-format
 msgid "Try `lxc info --show-log %s` for more info"
 msgstr "更に情報を得るために `lxc info --show-log %s` を実行してみてください"
@@ -1740,23 +1843,23 @@ msgstr "タイプ: ephemeral"
 msgid "Type: persistent"
 msgstr "タイプ: persistent"
 
-#: lxc/image.go:644
+#: lxc/image.go:641
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:382
+#: lxc/remote.go:381
 msgid "URL"
 msgstr ""
 
-#: lxc/network.go:425 lxc/profile.go:448
+#: lxc/network.go:424 lxc/profile.go:447
 msgid "USED BY"
 msgstr ""
 
-#: lxc/remote.go:96
+#: lxc/remote.go:95
 msgid "Unable to read remote TLS certificate"
 msgstr "リモートの TLS 証明書を読めません"
 
-#: lxc/image.go:355
+#: lxc/image.go:352
 #, c-format
 msgid "Uploaded: %s"
 msgstr "アップロード日時: %s"
@@ -1767,14 +1870,15 @@ msgid "Usage: %s"
 msgstr "使い方: %s"
 
 #: lxc/help.go:48
-msgid "Usage: lxc [subcommand] [options]"
+#, fuzzy
+msgid "Usage: lxc <command> [options]"
 msgstr "使い方: lxc [サブコマンド] [オプション]"
 
 #: lxc/delete.go:46
 msgid "User aborted delete operation."
 msgstr "ユーザが削除操作を中断しました。"
 
-#: lxc/restore.go:35
+#: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
 "available)"
@@ -1785,11 +1889,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr "コンテナの稼動状態のスナップショットを取得するかどうか"
 
-#: lxc/config.go:32
-msgid "Whether to show the expanded configuration"
-msgstr "拡張した設定を表示するかどうか"
-
-#: lxc/network.go:410 lxc/remote.go:357 lxc/remote.go:362
+#: lxc/network.go:409 lxc/remote.go:356 lxc/remote.go:361
 msgid "YES"
 msgstr ""
 
@@ -1797,7 +1897,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr "`lxc config profile` は廃止されました。`lxc profile` を使ってください"
 
-#: lxc/launch.go:127
+#: lxc/launch.go:128
 msgid "bad number of things scanned from image, container or snapshot"
 msgstr ""
 "イメージ、コンテナ、スナップショットのいずれかからスキャンされた数が不正"
@@ -1810,34 +1910,35 @@ msgstr "アクションからの結果タイプが不正です"
 msgid "can't copy to the same container name"
 msgstr "同じコンテナ名へはコピーできません"
 
-#: lxc/file.go:270
+#: lxc/file.go:272
 msgid "can't pull a directory without --recursive"
-msgstr "ディレクトリを pull する場合は --recursive オプションを使用してください。"
+msgstr ""
+"ディレクトリを pull する場合は --recursive オプションを使用してください。"
 
-#: lxc/remote.go:345
+#: lxc/remote.go:344
 msgid "can't remove the default remote"
 msgstr "デフォルトのリモートは削除できません"
 
-#: lxc/file.go:117
+#: lxc/file.go:119
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr "再帰 (recursive) モードでは uid/gid/mode を指定できません。"
 
-#: lxc/remote.go:371
+#: lxc/remote.go:370
 msgid "default"
 msgstr ""
 
 #: lxc/copy.go:131 lxc/copy.go:136 lxc/copy.go:232 lxc/copy.go:237
-#: lxc/init.go:217 lxc/init.go:222 lxc/launch.go:111 lxc/launch.go:116
+#: lxc/init.go:219 lxc/init.go:224 lxc/launch.go:112 lxc/launch.go:117
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 "サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
 "した"
 
-#: lxc/image.go:341
+#: lxc/image.go:338
 msgid "disabled"
 msgstr "無効"
 
-#: lxc/image.go:343
+#: lxc/image.go:340
 msgid "enabled"
 msgstr "有効"
 
@@ -1851,11 +1952,11 @@ msgstr "エラー: %v"
 msgid "error: unknown command: %s"
 msgstr "エラー: 未知のコマンド: %s"
 
-#: lxc/launch.go:131
+#: lxc/launch.go:132
 msgid "got bad version"
 msgstr "不正なバージョンを得ました"
 
-#: lxc/image.go:336 lxc/image.go:620
+#: lxc/image.go:333 lxc/image.go:617
 msgid "no"
 msgstr ""
 
@@ -1863,7 +1964,7 @@ msgstr ""
 msgid "not all the profiles from the source exist on the target"
 msgstr "コピー元の全てのプロファイルがターゲットに存在しません"
 
-#: lxc/remote.go:219
+#: lxc/remote.go:218
 msgid "ok (y/n)?"
 msgstr "ok (y/n)?"
 
@@ -1872,26 +1973,26 @@ msgstr "ok (y/n)?"
 msgid "processing aliases failed %s\n"
 msgstr "エイリアスの処理が失敗しました %s\n"
 
-#: lxc/file.go:311
+#: lxc/file.go:313
 msgid "recursive edit doesn't make sense :("
 msgstr "再帰的な edit は意味がありません :("
 
-#: lxc/remote.go:407
+#: lxc/remote.go:406
 #, c-format
 msgid "remote %s already exists"
 msgstr "リモート %s は既に存在します"
 
-#: lxc/remote.go:337 lxc/remote.go:399 lxc/remote.go:434 lxc/remote.go:450
+#: lxc/remote.go:336 lxc/remote.go:398 lxc/remote.go:433 lxc/remote.go:449
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "リモート %s は存在しません"
 
-#: lxc/remote.go:320
+#: lxc/remote.go:319
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "リモート %s は <%s> として存在します"
 
-#: lxc/remote.go:341 lxc/remote.go:403 lxc/remote.go:438
+#: lxc/remote.go:340 lxc/remote.go:402 lxc/remote.go:437
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr "リモート %s は static ですので変更できません"
@@ -1917,7 +2018,7 @@ msgstr "到達しないはずのreturnに到達しました"
 msgid "wrong number of subcommand arguments"
 msgstr "サブコマンドの引数の数が正しくありません"
 
-#: lxc/delete.go:45 lxc/image.go:338 lxc/image.go:624
+#: lxc/delete.go:45 lxc/image.go:335 lxc/image.go:621
 msgid "yes"
 msgstr ""
 


More information about the lxc-devel mailing list