[lxc-devel] [lxd/master] Implement "lxc query"

stgraber on Github lxc-bot at linuxcontainers.org
Fri Aug 4 00:07:03 UTC 2017


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170804/9ad1293b/attachment.bin>
-------------- next part --------------
From 09f5db0f09c771f9b5cf3cb65b37e1a1d8240958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 3 Aug 2017 20:06:09 -0400
Subject: [PATCH 1/2] lxc/query: Initial implementation of "lxc query"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #1943

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/main.go  |   1 +
 lxc/query.go | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 lxc/query.go

diff --git a/lxc/main.go b/lxc/main.go
index 7d4dfeef8..460b030d0 100644
--- a/lxc/main.go
+++ b/lxc/main.go
@@ -211,6 +211,7 @@ var commands = map[string]command{
 	"exec":    &execCmd{},
 	"file":    &fileCmd{},
 	"finger":  &fingerCmd{},
+	"query":   &queryCmd{},
 	"help":    &helpCmd{},
 	"image":   &imageCmd{},
 	"info":    &infoCmd{},
diff --git a/lxc/query.go b/lxc/query.go
new file mode 100644
index 000000000..1d45fb6e8
--- /dev/null
+++ b/lxc/query.go
@@ -0,0 +1,109 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/lxc/lxd/lxc/config"
+	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/gnuflag"
+	"github.com/lxc/lxd/shared/i18n"
+)
+
+type queryCmd struct {
+	respWait bool
+	respRaw  bool
+	action   string
+	data     string
+}
+
+func (c *queryCmd) showByDefault() bool {
+	return false
+}
+
+func (c *queryCmd) usage() string {
+	return i18n.G(
+		`Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API path>
+
+Send a raw query to LXD.
+
+*Examples*
+lxc query -X DELETE --wait /1.0/containers/c1
+    Delete local container "c1".`)
+}
+
+func (c *queryCmd) flags() {
+	gnuflag.BoolVar(&c.respWait, "wait", false, i18n.G("Wait for the operation to complete"))
+	gnuflag.BoolVar(&c.respRaw, "raw", false, i18n.G("Print the raw response"))
+	gnuflag.StringVar(&c.action, "X", "GET", i18n.G("Action (defaults to GET)"))
+	gnuflag.StringVar(&c.data, "d", "", i18n.G("Input data"))
+}
+
+func (c *queryCmd) pretty(input interface{}) string {
+	pretty, err := json.MarshalIndent(input, "", "\t")
+	if err != nil {
+		return fmt.Sprintf("%v", input)
+	}
+
+	return fmt.Sprintf("%s", pretty)
+}
+
+func (c *queryCmd) run(conf *config.Config, args []string) error {
+	if len(args) != 1 {
+		return errArgs
+	}
+
+	// Parse the remote
+	remote, path, err := conf.ParseRemote(args[0])
+	if err != nil {
+		return err
+	}
+
+	// Attempt to connect
+	d, err := conf.GetContainerServer(remote)
+	if err != nil {
+		return err
+	}
+
+	// Guess the encoding of the input
+	var data interface{}
+	err = json.Unmarshal([]byte(c.data), &data)
+	if err != nil {
+		data = c.data
+	}
+
+	// Perform the query
+	resp, _, err := d.RawQuery(c.action, path, data, "")
+	if err != nil {
+		return err
+	}
+
+	if c.respWait && resp.Operation != "" {
+		resp, _, err = d.RawQuery("GET", fmt.Sprintf("%s/wait", resp.Operation), "", "")
+		if err != nil {
+			return err
+		}
+
+		op := api.Operation{}
+		err = json.Unmarshal(resp.Metadata, &op)
+		if err == nil && op.Err != "" {
+			return fmt.Errorf(op.Err)
+		}
+	}
+
+	if c.respRaw {
+		fmt.Println(c.pretty(resp))
+	} else if resp.Metadata != nil && string(resp.Metadata) != "{}" {
+		var content interface{}
+		err := json.Unmarshal(resp.Metadata, &content)
+		if err != nil {
+			return err
+		}
+
+		if content != nil {
+			fmt.Println(c.pretty(content))
+		}
+	}
+
+	return nil
+}

From 302364bb307085d677dc4afa03cdcf24760b5289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 3 Aug 2017 20:06:29 -0400
Subject: [PATCH 2/2] i18n: Update 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      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/el.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/fr.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/it.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/ja.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/lxd.pot    | 174 +++++++++++++++++++++++++++++++++------------------------
 po/nl.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/ru.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/sr.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/sv.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/tr.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/zh.po      | 176 ++++++++++++++++++++++++++++++++++------------------------
 po/zh_Hans.po | 176 ++++++++++++++++++++++++++++++++++------------------------
 13 files changed, 1324 insertions(+), 962 deletions(-)

diff --git a/po/de.po b/po/de.po
index c9bc552dc..fb7bde3ac 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: 2017-02-14 17:11+0000\n"
 "Last-Translator: Tim Rose <tim at netlope.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -279,7 +279,7 @@ msgstr "'/' ist kein gültiges Zeichen im Namen eines Sicherungspunktes\n"
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -295,31 +295,35 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr "Akzeptiere Zertifikat"
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Administrator Passwort für %s: "
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 #, fuzzy
 msgid "Aliases:"
 msgstr "Aliasse:\n"
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, fuzzy, c-format
 msgid "Architecture: %s"
 msgstr "Architektur: %s\n"
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr "automatisches Update: %s"
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, fuzzy, c-format
 msgid "Bad property: %s"
 msgstr "Ungültige Abbild Eigenschaft: %s\n"
@@ -372,12 +376,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, fuzzy, c-format
 msgid "Certificate fingerprint: %s"
 msgstr "Fingerabdruck des Zertifikats: % x\n"
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr "Gespeichertes Nutzerzertifikat auf dem Server: "
 
@@ -394,7 +398,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, fuzzy, c-format
 msgid "Config parsing error: %s"
@@ -431,17 +435,17 @@ msgstr "Kopiere Aliasse von der Quelle"
 msgid "Copy the container without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 #, fuzzy
 msgid "Could not create config dir"
 msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 
@@ -449,7 +453,7 @@ msgstr "Kann Verzeichnis für Zertifikate auf dem Server nicht erstellen"
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -464,7 +468,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -492,7 +496,7 @@ msgstr "Gerät %s wurde von %s entfernt\n"
 msgid "Device already exists: %s"
 msgstr "entfernte Instanz %s existiert bereits"
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -548,16 +552,16 @@ msgstr "Fehler beim hinzufügen des Alias %s\n"
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -566,7 +570,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -604,7 +608,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, fuzzy, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerabdruck: %s\n"
@@ -630,7 +634,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 #, fuzzy
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "Generiere Nutzerzertifikat. Dies kann wenige Minuten dauern...\n"
@@ -660,32 +664,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, fuzzy, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Abbild mit Fingerabdruck %s importiert\n"
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -730,12 +738,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -786,7 +794,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr "Herunterfahren des Containers erzwingen."
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -795,12 +803,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "der Name des Ursprung Containers muss angegeben werden"
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -855,11 +863,11 @@ msgstr "Kein Fingerabdruck angegeben."
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -887,11 +895,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -913,7 +921,7 @@ msgstr "Alternatives config Verzeichnis."
 msgid "Path to an alternate server directory"
 msgstr "Alternatives config Verzeichnis."
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 #, fuzzy
 msgid "Pause containers."
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -932,7 +940,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -944,6 +952,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -988,16 +1000,16 @@ msgstr "Profil %s wurde auf %s angewandt\n"
 msgid "Profiles: %s"
 msgstr "Profil %s erstellt\n"
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 #, fuzzy
 msgid "Properties:"
 msgstr "Eigenschaften:\n"
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, fuzzy, c-format
 msgid "Public: %s"
 msgstr "Öffentlich: %s\n"
@@ -1006,12 +1018,12 @@ msgstr "Öffentlich: %s\n"
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr "Entferntes Administrator Passwort"
 
@@ -1038,7 +1050,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 #, fuzzy
 msgid "Restart containers."
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -1064,7 +1076,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -1072,16 +1084,16 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr "Server Zertifikat vom Benutzer nicht akzeptiert"
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 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:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -1113,7 +1125,7 @@ msgstr "Zeige die letzten 100 Zeilen Protokoll des Containers?"
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, fuzzy, c-format
 msgid "Size: %.2fMB"
 msgstr "Größe: %.2vMB\n"
@@ -1127,11 +1139,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 #, fuzzy
 msgid "Start containers."
 msgstr "kann nicht zum selben Container Namen kopieren"
@@ -1146,7 +1158,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 #, fuzzy
 msgid "Stop containers."
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -1267,7 +1279,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "Wartezeit bevor der Container gestoppt wird."
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 #, fuzzy
 msgid "Timestamps:"
 msgstr "Zeitstempel:\n"
@@ -1293,7 +1305,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr "kann nicht zum selben Container Namen kopieren"
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1315,7 +1327,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1327,7 +1339,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1336,7 +1348,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr "Unbekannter Befehl %s für Abbild"
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -2095,7 +2107,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 #, fuzzy
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
@@ -2285,6 +2309,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -2297,7 +2325,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr "Zustand des laufenden Containers sichern oder nicht"
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2319,7 +2347,7 @@ msgstr "der Name des Ursprung Containers muss angegeben werden"
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2327,7 +2355,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2335,11 +2363,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2353,16 +2381,16 @@ msgstr "Fehler: %v\n"
 msgid "error: unknown command: %s"
 msgstr "Fehler: unbekannter Befehl: %s\n"
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 #, fuzzy
 msgid "ok (y/n)?"
 msgstr "OK (y/n)? "
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2371,22 +2399,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr "entfernte Instanz %s existiert bereits"
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "entfernte Instanz %s existiert nicht"
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "entfernte Instanz %s existiert als <%s>"
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2404,11 +2432,11 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr "falsche Anzahl an Parametern für Unterbefehl"
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index eb1113eb4..799e1feff 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -174,7 +174,7 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -190,30 +190,34 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -266,12 +270,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr ""
 
@@ -287,7 +291,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -323,16 +327,16 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid "Could not create config dir"
 msgstr ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -340,7 +344,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -354,7 +358,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -382,7 +386,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -436,16 +440,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -454,7 +458,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -491,7 +495,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -516,7 +520,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -544,32 +548,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -613,12 +621,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -667,7 +675,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -675,12 +683,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -732,11 +740,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -764,11 +772,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -788,7 +796,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -806,7 +814,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -818,6 +826,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -861,15 +873,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -878,12 +890,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -909,7 +921,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -934,7 +946,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -942,15 +954,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -982,7 +994,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -996,11 +1008,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1014,7 +1026,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1127,7 +1139,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1152,7 +1164,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1174,7 +1186,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1186,7 +1198,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1195,7 +1207,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1816,7 +1828,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -1985,6 +2009,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -1995,7 +2023,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2015,7 +2043,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2023,7 +2051,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2031,11 +2059,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2049,15 +2077,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2066,22 +2094,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2099,10 +2127,10 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 874436957..f68319a05 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: 2017-06-07 15:24+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -269,7 +269,7 @@ msgstr "'/' n'est pas autorisé dans le nom d'un instantané"
 msgid "(none)"
 msgstr "(aucun)"
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -286,30 +286,34 @@ msgstr "ARCH"
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTURE"
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr "Accepter le certificat"
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Mot de passe administrateur pour %s : "
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr "Alias :"
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architecture : %s"
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr "Mise à jour auto. : %s"
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -364,12 +368,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr "Impossible de fournir le nom du conteneur à lister"
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, fuzzy, c-format
 msgid "Certificate fingerprint: %s"
 msgstr "Empreinte du certificat : %x"
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr "Certificat client enregistré sur le serveur : "
 
@@ -385,7 +389,7 @@ msgstr "Commandes:"
 msgid "Config key/value to apply to the new container"
 msgstr "Clé/valeur de configuration à appliquer au nouveau conteneur"
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -422,17 +426,17 @@ msgstr "Copier les alias depuis la source"
 msgid "Copy the container without its snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Copie de l'image : %s"
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 #, fuzzy
 msgid "Could not create config dir"
 msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 
@@ -440,7 +444,7 @@ msgstr "Impossible de créer le dossier de stockage des certificats serveurs"
 msgid "Create any directories necessary"
 msgstr "Créer tous répertoires nécessaires"
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr "Créé : %s"
@@ -454,7 +458,7 @@ msgstr "Création de %s"
 msgid "Creating the container"
 msgstr "Création du conteneur"
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -482,7 +486,7 @@ msgstr "Périphérique %s retiré de %s"
 msgid "Device already exists: %s"
 msgstr "le serveur distant %s existe déjà"
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -536,16 +540,16 @@ msgstr "Import de l'image : %s"
 msgid "Event type to listen for"
 msgstr "Type d'évènements à surveiller"
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr "Expire : %s"
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr "N'expire jamais"
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, fuzzy, c-format
 msgid "Exporting the image: %s"
 msgstr "Import de l'image : %s"
@@ -555,7 +559,7 @@ msgstr "Import de l'image : %s"
 msgid "FILENAME"
 msgstr "NOM"
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr "EMPREINTE"
 
@@ -594,7 +598,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr "Mode rapide (identique à --columns=nsacPt"
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Empreinte : %s"
@@ -619,7 +623,7 @@ msgstr "Forcer l'utilisation de la socket unix locale"
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "Génération d'un certificat client. Ceci peut prendre une minute…"
 
@@ -650,34 +654,38 @@ msgstr "Ignorer les alias pour déterminer la commande à exécuter"
 msgid "Ignore the container state (only for start)"
 msgstr "Ignorer l'état du conteneur (seulement pour start)"
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 #, fuzzy
 msgid "Image exported successfully!"
 msgstr "Image copiée avec succès !"
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "Image importée avec l'empreinte : %s"
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 #, fuzzy
 msgid "Image refreshed successfully!"
 msgstr "Image copiée avec succès !"
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr "Schème d'URL invalide \"%s\" in \"%s\""
@@ -721,12 +729,12 @@ msgstr "DERNIÈRE UTILISATION À"
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr "Socket LXD introuvable ; LXD est-il installé et actif ?"
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr "Dernière utilisation : %s"
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr "Dernière utilisation : jamais"
 
@@ -777,7 +785,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr "Forcer le conteneur à s'arrêter"
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -785,12 +793,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr "Vous devez fournir le nom d'un conteneur pour : "
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr "NOM"
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr "NON"
 
@@ -843,11 +851,11 @@ msgstr "Aucune empreinte n'a été indiquée."
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr "Seul les volumes \"personnalisés\" peuvent être attaché aux conteneurs"
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr "Seules les URLs https sont supportées par simplestreams"
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr "Seul https:// est supporté par l'import d'images distantes."
 
@@ -875,11 +883,11 @@ msgstr "PID"
 msgid "PROFILES"
 msgstr "PROFILS"
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr "PROTOCOLE"
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr "PUBLIC"
 
@@ -899,7 +907,7 @@ msgstr "Chemin vers un dossier de configuration client alternatif"
 msgid "Path to an alternate server directory"
 msgstr "Chemin vers un dossier de configuration serveur alternatif"
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 #, fuzzy
 msgid "Pause containers."
 msgstr "Création du conteneur"
@@ -918,7 +926,7 @@ msgid "Press enter to open the editor again"
 msgstr "Appuyer sur Entrée pour ouvrir à nouveau l'éditeur"
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr "Appuyer sur Entrée pour lancer à nouveau l'éditeur"
 
@@ -930,6 +938,10 @@ msgstr "Afficher les informations de débogage"
 msgid "Print less common commands"
 msgstr "Afficher les commandes moins communes"
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr "Afficher des informations supplémentaires"
@@ -973,15 +985,15 @@ msgstr "Profils %s appliqués à %s"
 msgid "Profiles: %s"
 msgstr "Profils : %s"
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr "Propriétés :"
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr "Serveur d'images public"
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr "Public : %s"
@@ -990,12 +1002,12 @@ msgstr "Public : %s"
 msgid "Recursively push or pull files"
 msgstr "Pousser ou récupérer des fichiers récursivement"
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "Récupération de l'image : %s"
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr "Mot de passe de l'administrateur distant"
 
@@ -1022,7 +1034,7 @@ msgstr "Requérir une confirmation de l'utilisateur"
 msgid "Resources:"
 msgstr "Ressources :"
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 #, fuzzy
 msgid "Restart containers."
 msgstr "Création du conteneur"
@@ -1048,7 +1060,7 @@ msgstr "SOURCE"
 msgid "STATE"
 msgstr "ÉTAT"
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr "STATIQUE"
 
@@ -1056,16 +1068,16 @@ msgstr "STATIQUE"
 msgid "STORAGE POOL"
 msgstr "ENSEMBLE DE STOCKAGE"
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr "Certificat serveur rejeté par l'utilisateur"
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 "Le serveur ne nous fait pas confiance après l'ajout de notre certificat"
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr "Protocole du serveur (lxd ou simplestreams)"
 
@@ -1097,7 +1109,7 @@ msgstr "Afficher les 100 dernières lignes du journal du conteneur ?"
 msgid "Show the expanded configuration"
 msgstr "Afficher la configuration étendue"
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "Taille : %.2f Mo"
@@ -1111,11 +1123,11 @@ msgstr "Instantanés :"
 msgid "Some containers failed to %s"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr "Source :"
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 #, fuzzy
 msgid "Start containers."
 msgstr "Création du conteneur"
@@ -1130,7 +1142,7 @@ msgstr "Démarrage de %s"
 msgid "Status: %s"
 msgstr "État : %s"
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 #, fuzzy
 msgid "Stop containers."
 msgstr "L'arrêt du conteneur a échoué !"
@@ -1255,7 +1267,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "Temps d'attente du conteneur avant de le tuer"
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr "Horodatage :"
 
@@ -1281,7 +1293,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr "Transfert de l'image : %s"
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr "Transfert de l'image : %s"
@@ -1303,7 +1315,7 @@ msgstr "Type : persistant"
 msgid "UPLOAD DATE"
 msgstr "DATE DE PUBLICATION"
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr "URL"
 
@@ -1315,7 +1327,7 @@ msgstr "UTILISÉ PAR"
 msgid "Unable to find help2man."
 msgstr "Impossible de trouver help2man"
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr "Impossible de lire le certificat TLS distant"
 
@@ -1324,7 +1336,7 @@ msgstr "Impossible de lire le certificat TLS distant"
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr "Publié : %s"
@@ -2344,7 +2356,19 @@ msgstr ""
 "lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--"
 "alias=ALIAS...] [prop-key=prop-value...]"
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 #, fuzzy
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
@@ -2566,6 +2590,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -2578,7 +2606,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr "Réaliser ou pas l'instantané de l'état de fonctionnement du conteneur"
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr "OUI"
 
@@ -2602,7 +2630,7 @@ msgstr ""
 "La commande `lxc config profile` est dépréciée, merci d'utiliser `lxc "
 "profile`"
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr "impossible de supprimer le serveur distant par défaut"
 
@@ -2610,7 +2638,7 @@ msgstr "impossible de supprimer le serveur distant par défaut"
 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:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr "par défaut"
 
@@ -2618,11 +2646,11 @@ msgstr "par défaut"
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr "pas d'image, conteneur ou instantané affecté sur ce serveur"
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr "désactivé"
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr "activé"
 
@@ -2636,15 +2664,15 @@ msgstr "erreur : %v"
 msgid "error: unknown command: %s"
 msgstr "erreur : commande inconnue: %s"
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr "non"
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr "ok (y/n) ?"
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr "l'analyse des alias a échoué %s\n"
@@ -2653,22 +2681,22 @@ msgstr "l'analyse des alias a échoué %s\n"
 msgid "recursive edit doesn't make sense :("
 msgstr "l'édition récursive ne fait aucun sens :("
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr "le serveur distant %s existe déjà"
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "le serveur distant %s n'existe pas"
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "le serveur distant %s existe en tant que <%s>"
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr "le serveur distant %s est statique et ne peut être modifié"
@@ -2686,11 +2714,11 @@ msgstr "sans suivi d'état"
 msgid "taken at %s"
 msgstr "pris à %s"
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr "nombre d'arguments incorrect pour la sous-comande"
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr "oui"
 
diff --git a/po/it.po b/po/it.po
index a88fb88a3..9ad0b344c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: 2017-07-13 19:23+0000\n"
 "Last-Translator: Alberto Donato <alberto.donato at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -195,7 +195,7 @@ msgstr "'/' non è permesso nel nome di uno snapshot"
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr "ALIAS"
 
@@ -211,30 +211,34 @@ msgstr "ARCH"
 msgid "ARCHITECTURE"
 msgstr "ARCHITETTURA"
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr "Accetta certificato"
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Password amministratore per %s: "
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr "Alias:"
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architettura: %s"
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr "Aggiornamento automatico: %s"
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr "Proprietà errata: %s"
@@ -286,12 +290,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr "Certificato del client salvato dal server: "
 
@@ -307,7 +311,7 @@ msgstr "Comandi:"
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -343,16 +347,16 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid "Could not create config dir"
 msgstr ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -360,7 +364,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -374,7 +378,7 @@ msgstr "Creazione di %s in corso"
 msgid "Creating the container"
 msgstr "Creazione del container in corso"
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr "DESCRIZIONE"
@@ -402,7 +406,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr "La periferica esiste già: %s"
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr "Import da directory non disponibile su questa piattaforma"
 
@@ -455,16 +459,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -473,7 +477,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -510,7 +514,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -535,7 +539,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -563,32 +567,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -632,12 +640,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -685,7 +693,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -693,12 +701,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -749,11 +757,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -781,11 +789,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -805,7 +813,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -823,7 +831,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -835,6 +843,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -878,15 +890,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -895,12 +907,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -926,7 +938,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -951,7 +963,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -959,15 +971,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -999,7 +1011,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -1013,11 +1025,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1031,7 +1043,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1144,7 +1156,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1169,7 +1181,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1191,7 +1203,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1203,7 +1215,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1212,7 +1224,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1833,7 +1845,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -2002,6 +2026,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -2012,7 +2040,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2032,7 +2060,7 @@ msgstr "Occorre specificare un nome di container come origine"
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2040,7 +2068,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2048,11 +2076,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2066,15 +2094,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr "no"
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr "ok (y/n)?"
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr "errore di processamento degli alias %s\n"
@@ -2083,22 +2111,22 @@ msgstr "errore di processamento degli alias %s\n"
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr "il remote %s esiste già"
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "il remote %s non esiste"
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "il remote %s esiste come %s"
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr "il remote %s è statico e non può essere modificato"
@@ -2116,11 +2144,11 @@ msgstr "senza stato"
 msgid "taken at %s"
 msgstr "salvato alle %s"
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr "numero errato di argomenti del sottocomando"
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr "si"
 
diff --git a/po/ja.po b/po/ja.po
index 2905ac208..2863a6dd8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: 2017-07-20 00:30+0000\n"
 "Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -175,7 +175,7 @@ msgstr "'/' はスナップショットの名前には使用できません"
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -191,30 +191,34 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr "証明書を受け入れます"
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr "%s の管理者パスワード: "
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr "エイリアス:"
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr "アーキテクチャ: %s"
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr "自動更新: %s"
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr "不正なイメージプロパティ形式: %s"
@@ -268,12 +272,12 @@ msgstr "キー '%s' が指定されていないので削除できません。"
 msgid "Cannot provide container name to list"
 msgstr "コンテナ名を取得できません"
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr "クライアント証明書がサーバに格納されました: "
 
@@ -289,7 +293,7 @@ msgstr "コマンド:"
 msgid "Config key/value to apply to the new container"
 msgstr "新しいコンテナに適用するキー/値の設定"
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -325,17 +329,17 @@ msgstr "ソースからエイリアスをコピーしました"
 msgid "Copy the container without its snapshots"
 msgstr "コンテナをコピーします (スナップショットはコピーしません)"
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr "イメージのコピー中: %s"
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 #, fuzzy
 msgid "Could not create config dir"
 msgstr "サーバ証明書格納用のディレクトリを作成できません"
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr "サーバ証明書格納用のディレクトリを作成できません"
 
@@ -343,7 +347,7 @@ msgstr "サーバ証明書格納用のディレクトリを作成できません
 msgid "Create any directories necessary"
 msgstr "必要なディレクトリをすべて作成します"
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr "作成日時: %s"
@@ -357,7 +361,7 @@ msgstr "%s を作成中"
 msgid "Creating the container"
 msgstr "コンテナを作成中"
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -385,7 +389,7 @@ msgstr "デバイス %s が %s から削除されました"
 msgid "Device already exists: %s"
 msgstr "デバイスは既に存在します: %s"
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr "このプラットフォーム上ではディレクトリのインポートは利用できません"
 
@@ -438,16 +442,16 @@ msgstr "イメージのエクスポート中: %s"
 msgid "Event type to listen for"
 msgstr "Listenするイベントタイプ"
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr "失効日時: %s"
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr "失効日時: 失効しない"
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr "イメージのエクスポート中: %s"
@@ -456,7 +460,7 @@ msgstr "イメージのエクスポート中: %s"
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -494,7 +498,7 @@ msgstr "パス %s にアクセスできませんでした: %s"
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr "Fast モード (--columns=nsacPt と同じ)"
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "証明書のフィンガープリント: %s"
@@ -519,7 +523,7 @@ msgstr "強制的にローカルのUNIXソケットを使います"
 msgid "Format (csv|json|table|yaml)"
 msgstr "フォーマット (csv|json|table|yaml)"
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr "クライアント証明書を生成します。1分ぐらいかかります..."
 
@@ -547,32 +551,36 @@ msgstr "どのコマンドを実行するか決める際にエイリアスを無
 msgid "Ignore the container state (only for start)"
 msgstr "コンテナの状態を無視します (startのみ)"
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr "イメージは更新済みです。"
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr "イメージのコピーが成功しました!"
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr "イメージのエクスポートが成功しました!"
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr "イメージは以下のフィンガープリントでインポートされました: %s"
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr "イメージの更新が成功しました!"
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr "不正な URL スキーム \"%s\" (\"%s\" 内)"
@@ -616,12 +624,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr "LXD のソケットが見つかりません。LXD が実行されていますか?"
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr "最終使用: %s"
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr "最終使用: 未使用"
 
@@ -671,7 +679,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr "コンテナを移動します (スナップショットは移動しません)"
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr "ディレクトリからのインポートは root で実行する必要があります"
 
@@ -679,12 +687,12 @@ msgstr "ディレクトリからのインポートは root で実行する必要
 msgid "Must supply container name for: "
 msgstr "コンテナ名を指定する必要があります: "
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -735,11 +743,11 @@ msgstr "フィンガープリントが指定されていません。"
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr "\"カスタム\" のボリュームのみがコンテナにアタッチできます。"
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr "simplestreams は https の URL のみサポートします"
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr "リモートイメージのインポートは https:// のみをサポートします。"
 
@@ -767,11 +775,11 @@ msgstr "PID"
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -791,7 +799,7 @@ msgstr "別のクライアント用設定ディレクトリ"
 msgid "Path to an alternate server directory"
 msgstr "別のサーバ用設定ディレクトリ"
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr "コンテナを一時停止します。"
 
@@ -809,7 +817,7 @@ msgid "Press enter to open the editor again"
 msgstr "再度エディタを開くためには Enter キーを押します"
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr "再度エディタを起動するには Enter キーを押します"
 
@@ -821,6 +829,10 @@ msgstr "デバッグ情報を表示します"
 msgid "Print less common commands"
 msgstr "全てのコマンドを表示します (主なコマンドだけではなく)"
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr "詳細情報を表示します"
@@ -864,15 +876,15 @@ msgstr "プロファイル %s が %s に追加されました"
 msgid "Profiles: %s"
 msgstr "プロファイル: %s"
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr "プロパティ:"
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr "Public なイメージサーバとして設定します"
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr "パブリック: %s"
@@ -881,12 +893,12 @@ msgstr "パブリック: %s"
 msgid "Recursively push or pull files"
 msgstr "再帰的にファイルをpush/pullします"
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr "イメージの更新中: %s"
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr "リモートの管理者パスワード"
 
@@ -912,7 +924,7 @@ msgstr "ユーザの確認を要求する"
 msgid "Resources:"
 msgstr "リソース:"
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr "コンテナを再起動します。"
 
@@ -937,7 +949,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -945,15 +957,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr "ユーザによりサーバ証明書が拒否されました"
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr "サーバが我々の証明書を追加した後我々を信頼していません"
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr "サーバのプロトコル (lxd or simplestreams)"
 
@@ -985,7 +997,7 @@ msgstr "コンテナログの最後の 100 行を表示しますか?"
 msgid "Show the expanded configuration"
 msgstr "拡張した設定を表示する"
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr "サイズ: %.2fMB"
@@ -999,11 +1011,11 @@ msgstr "スナップショット:"
 msgid "Some containers failed to %s"
 msgstr "一部のコンテナで %s が失敗しました"
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr "取得元:"
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr "コンテナを起動します。"
 
@@ -1017,7 +1029,7 @@ msgstr "%s を起動中"
 msgid "Status: %s"
 msgstr "状態: %s"
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr "コンテナを停止します。"
 
@@ -1139,7 +1151,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr "コンテナを強制停止するまでの時間"
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr "タイムスタンプ:"
 
@@ -1168,7 +1180,7 @@ msgstr "転送モード。pull, push, relay のいずれか(デフォルトはpu
 msgid "Transferring container: %s"
 msgstr "コンテナを転送中: %s"
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr "イメージを転送中: %s"
@@ -1190,7 +1202,7 @@ msgstr "タイプ: persistent"
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1202,7 +1214,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr "help2man が見つかりません。"
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr "リモートの TLS 証明書を読めません"
 
@@ -1211,7 +1223,7 @@ msgstr "リモートの TLS 証明書を読めません"
 msgid "Unknown file type '%s'"
 msgstr "未知のファイルタイプ '%s'"
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr "アップロード日時: %s"
@@ -2339,7 +2351,19 @@ msgstr ""
 "\n"
 "イメージとしてコンテナを publish します。"
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -2649,6 +2673,10 @@ msgstr ""
 "ユーザからのシグナルを 3 度受信したので exit しました。リモート操作は実行し続"
 "けます。"
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -2660,7 +2688,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr "コンテナの稼動状態のスナップショットを取得するかどうか"
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2681,7 +2709,7 @@ msgstr "コピー元のコンテナ名を指定してください"
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr "`lxc config profile` は廃止されました。`lxc profile` を使ってください"
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr "デフォルトのリモートは削除できません"
 
@@ -2689,7 +2717,7 @@ msgstr "デフォルトのリモートは削除できません"
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr "再帰 (recursive) モードでは uid/gid/mode を指定できません"
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2699,11 +2727,11 @@ msgstr ""
 "サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
 "した"
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr "無効"
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr "有効"
 
@@ -2717,15 +2745,15 @@ msgstr "エラー: %v"
 msgid "error: unknown command: %s"
 msgstr "エラー: 未知のコマンド: %s"
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr "ok (y/n)?"
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr "エイリアスの処理が失敗しました %s\n"
@@ -2734,22 +2762,22 @@ msgstr "エイリアスの処理が失敗しました %s\n"
 msgid "recursive edit doesn't make sense :("
 msgstr "再帰的な edit は意味がありません :("
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr "リモート %s は既に存在します"
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr "リモート %s は存在しません"
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr "リモート %s は <%s> として存在します"
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr "リモート %s は static ですので変更できません"
@@ -2767,11 +2795,11 @@ msgstr ""
 msgid "taken at %s"
 msgstr "%s に取得しました"
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr "サブコマンドの引数の数が正しくありません"
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""
 
diff --git a/po/lxd.pot b/po/lxd.pot
index d8b60a0c0..8e3c233e9 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2017-07-27 18:42-0400\n"
+        "POT-Creation-Date: 2017-08-03 19:23-0400\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -164,7 +164,7 @@ msgstr  ""
 msgid   "(none)"
 msgstr  ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid   "ALIAS"
 msgstr  ""
 
@@ -180,30 +180,34 @@ msgstr  ""
 msgid   "ARCHITECTURE"
 msgstr  ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid   "Accept certificate"
 msgstr  ""
 
-#: lxc/remote.go:289
+#: lxc/query.go:39
+msgid   "Action (defaults to GET)"
+msgstr  ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid   "Admin password for %s: "
 msgstr  ""
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid   "Aliases:"
 msgstr  ""
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid   "Architecture: %s"
 msgstr  ""
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid   "Auto update: %s"
 msgstr  ""
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid   "Bad property: %s"
 msgstr  ""
@@ -255,12 +259,12 @@ msgstr  ""
 msgid   "Cannot provide container name to list"
 msgstr  ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid   "Certificate fingerprint: %s"
 msgstr  ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid   "Client certificate stored at server: "
 msgstr  ""
 
@@ -276,7 +280,7 @@ msgstr  ""
 msgid   "Config key/value to apply to the new container"
 msgstr  ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144 lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143 lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid   "Config parsing error: %s"
 msgstr  ""
@@ -311,16 +315,16 @@ msgstr  ""
 msgid   "Copy the container without its snapshots"
 msgstr  ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid   "Copying the image: %s"
 msgstr  ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid   "Could not create config dir"
 msgstr  ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid   "Could not create server cert dir"
 msgstr  ""
 
@@ -328,7 +332,7 @@ msgstr  ""
 msgid   "Create any directories necessary"
 msgstr  ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid   "Created: %s"
 msgstr  ""
@@ -342,7 +346,7 @@ msgstr  ""
 msgid   "Creating the container"
 msgstr  ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507 lxc/storage.go:654 lxc/storage.go:749
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507 lxc/storage.go:654 lxc/storage.go:749
 msgid   "DESCRIPTION"
 msgstr  ""
 
@@ -369,7 +373,7 @@ msgstr  ""
 msgid   "Device already exists: %s"
 msgstr  ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid   "Directory import is not available on this platform"
 msgstr  ""
 
@@ -422,16 +426,16 @@ msgstr  ""
 msgid   "Event type to listen for"
 msgstr  ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid   "Expires: %s"
 msgstr  ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid   "Expires: never"
 msgstr  ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid   "Exporting the image: %s"
 msgstr  ""
@@ -440,7 +444,7 @@ msgstr  ""
 msgid   "FILENAME"
 msgstr  ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid   "FINGERPRINT"
 msgstr  ""
 
@@ -477,7 +481,7 @@ msgstr  ""
 msgid   "Fast mode (same as --columns=nsacPt)"
 msgstr  ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid   "Fingerprint: %s"
 msgstr  ""
@@ -502,7 +506,7 @@ msgstr  ""
 msgid   "Format (csv|json|table|yaml)"
 msgstr  ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid   "Generating a client certificate. This may take a minute..."
 msgstr  ""
 
@@ -530,32 +534,36 @@ msgstr  ""
 msgid   "Ignore the container state (only for start)"
 msgstr  ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid   "Image already up to date."
 msgstr  ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid   "Image copied successfully!"
 msgstr  ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid   "Image exported successfully!"
 msgstr  ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid   "Image imported with fingerprint: %s"
 msgstr  ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid   "Image refreshed successfully!"
 msgstr  ""
 
+#: lxc/query.go:40
+msgid   "Input data"
+msgstr  ""
+
 #: lxc/init.go:147
 msgid   "Instance type"
 msgstr  ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid   "Invalid URL scheme \"%s\" in \"%s\""
 msgstr  ""
@@ -599,12 +607,12 @@ msgstr  ""
 msgid   "LXD socket not found; is LXD installed and running?"
 msgstr  ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid   "Last used: %s"
 msgstr  ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid   "Last used: never"
 msgstr  ""
 
@@ -652,7 +660,7 @@ msgstr  ""
 msgid   "Move the container without its snapshots"
 msgstr  ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid   "Must run as root to import from directory"
 msgstr  ""
 
@@ -660,11 +668,11 @@ msgstr  ""
 msgid   "Must supply container name for: "
 msgstr  ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414 lxc/storage.go:653 lxc/storage.go:748
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431 lxc/storage.go:653 lxc/storage.go:748
 msgid   "NAME"
 msgstr  ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid   "NO"
 msgstr  ""
 
@@ -715,11 +723,11 @@ msgstr  ""
 msgid   "Only \"custom\" volumes can be attached to containers."
 msgstr  ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid   "Only https URLs are supported for simplestreams"
 msgstr  ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid   "Only https:// is supported for remote image import."
 msgstr  ""
 
@@ -747,11 +755,11 @@ msgstr  ""
 msgid   "PROFILES"
 msgstr  ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid   "PROTOCOL"
 msgstr  ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid   "PUBLIC"
 msgstr  ""
 
@@ -771,7 +779,7 @@ msgstr  ""
 msgid   "Path to an alternate server directory"
 msgstr  ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid   "Pause containers."
 msgstr  ""
 
@@ -788,7 +796,7 @@ msgstr  ""
 msgid   "Press enter to open the editor again"
 msgstr  ""
 
-#: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382 lxc/image.go:1145
+#: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382 lxc/image.go:1144
 msgid   "Press enter to start the editor again"
 msgstr  ""
 
@@ -800,6 +808,10 @@ msgstr  ""
 msgid   "Print less common commands"
 msgstr  ""
 
+#: lxc/query.go:38
+msgid   "Print the raw response"
+msgstr  ""
+
 #: lxc/help.go:74
 msgid   "Print verbose information"
 msgstr  ""
@@ -843,15 +855,15 @@ msgstr  ""
 msgid   "Profiles: %s"
 msgstr  ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid   "Properties:"
 msgstr  ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid   "Public image server"
 msgstr  ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid   "Public: %s"
 msgstr  ""
@@ -860,12 +872,12 @@ msgstr  ""
 msgid   "Recursively push or pull files"
 msgstr  ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid   "Refreshing the image: %s"
 msgstr  ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid   "Remote admin password"
 msgstr  ""
 
@@ -891,7 +903,7 @@ msgstr  ""
 msgid   "Resources:"
 msgstr  ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid   "Restart containers."
 msgstr  ""
 
@@ -916,7 +928,7 @@ msgstr  ""
 msgid   "STATE"
 msgstr  ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid   "STATIC"
 msgstr  ""
 
@@ -924,15 +936,15 @@ msgstr  ""
 msgid   "STORAGE POOL"
 msgstr  ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid   "Server certificate NACKed by user"
 msgstr  ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid   "Server doesn't trust us after adding our cert"
 msgstr  ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid   "Server protocol (lxd or simplestreams)"
 msgstr  ""
 
@@ -964,7 +976,7 @@ msgstr  ""
 msgid   "Show the expanded configuration"
 msgstr  ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid   "Size: %.2fMB"
 msgstr  ""
@@ -978,11 +990,11 @@ msgstr  ""
 msgid   "Some containers failed to %s"
 msgstr  ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid   "Source:"
 msgstr  ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid   "Start containers."
 msgstr  ""
 
@@ -996,7 +1008,7 @@ msgstr  ""
 msgid   "Status: %s"
 msgstr  ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid   "Stop containers."
 msgstr  ""
 
@@ -1105,7 +1117,7 @@ msgstr  ""
 msgid   "Time to wait for the container before killing it"
 msgstr  ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid   "Timestamps:"
 msgstr  ""
 
@@ -1130,7 +1142,7 @@ msgstr  ""
 msgid   "Transferring container: %s"
 msgstr  ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid   "Transferring image: %s"
 msgstr  ""
@@ -1152,7 +1164,7 @@ msgstr  ""
 msgid   "UPLOAD DATE"
 msgstr  ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid   "URL"
 msgstr  ""
 
@@ -1164,7 +1176,7 @@ msgstr  ""
 msgid   "Unable to find help2man."
 msgstr  ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid   "Unable to read remote TLS certificate"
 msgstr  ""
 
@@ -1173,7 +1185,7 @@ msgstr  ""
 msgid   "Unknown file type '%s'"
 msgstr  ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid   "Uploaded: %s"
 msgstr  ""
@@ -1729,7 +1741,17 @@ msgid   "Usage: lxc publish [<remote>:]<container>[/<snapshot>] [<remote>:] [--a
         "Publish containers as images."
 msgstr  ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:26
+msgid   "Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API path>\n"
+        "\n"
+        "Send a raw query to LXD.\n"
+        "\n"
+        "*Examples*\n"
+        "lxc query -X DELETE --wait /1.0/containers/c1\n"
+        "    Delete local container \"c1\"."
+msgstr  ""
+
+#: lxc/remote.go:40
 msgid   "Usage: lxc remote <subcommand> [options]\n"
         "\n"
         "Manage the list of remote LXD servers.\n"
@@ -1881,6 +1903,10 @@ msgstr  ""
 msgid   "User signaled us three times, exiting. The remote operation will keep running."
 msgstr  ""
 
+#: lxc/query.go:37
+msgid   "Wait for the operation to complete"
+msgstr  ""
+
 #: lxc/restore.go:38
 msgid   "Whether or not to restore the container's running state from snapshot (if available)"
 msgstr  ""
@@ -1889,7 +1915,7 @@ msgstr  ""
 msgid   "Whether or not to snapshot the container's running state"
 msgstr  ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid   "YES"
 msgstr  ""
 
@@ -1909,7 +1935,7 @@ msgstr  ""
 msgid   "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr  ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid   "can't remove the default remote"
 msgstr  ""
 
@@ -1917,7 +1943,7 @@ msgstr  ""
 msgid   "can't supply uid/gid/mode in recursive mode"
 msgstr  ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid   "default"
 msgstr  ""
 
@@ -1925,11 +1951,11 @@ msgstr  ""
 msgid   "didn't get any affected image, container or snapshot from server"
 msgstr  ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid   "disabled"
 msgstr  ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid   "enabled"
 msgstr  ""
 
@@ -1943,15 +1969,15 @@ msgstr  ""
 msgid   "error: unknown command: %s"
 msgstr  ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid   "no"
 msgstr  ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid   "ok (y/n)?"
 msgstr  ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid   "processing aliases failed %s\n"
 msgstr  ""
@@ -1960,22 +1986,22 @@ msgstr  ""
 msgid   "recursive edit doesn't make sense :("
 msgstr  ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid   "remote %s already exists"
 msgstr  ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid   "remote %s doesn't exist"
 msgstr  ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid   "remote %s exists as <%s>"
 msgstr  ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid   "remote %s is static and cannot be modified"
 msgstr  ""
@@ -1993,11 +2019,11 @@ msgstr  ""
 msgid   "taken at %s"
 msgstr  ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid   "wrong number of subcommand arguments"
 msgstr  ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid   "yes"
 msgstr  ""
 
diff --git a/po/nl.po b/po/nl.po
index 71a720753..fd85d8f0c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -171,7 +171,7 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -187,30 +187,34 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -262,12 +266,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr ""
 
@@ -283,7 +287,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -319,16 +323,16 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid "Could not create config dir"
 msgstr ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -336,7 +340,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -350,7 +354,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -378,7 +382,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -431,16 +435,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -449,7 +453,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -486,7 +490,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -511,7 +515,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -539,32 +543,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -608,12 +616,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -661,7 +669,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -669,12 +677,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -725,11 +733,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -757,11 +765,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -781,7 +789,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -799,7 +807,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -811,6 +819,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -854,15 +866,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -871,12 +883,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -902,7 +914,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -927,7 +939,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -935,15 +947,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -975,7 +987,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -989,11 +1001,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1007,7 +1019,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1120,7 +1132,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1145,7 +1157,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1179,7 +1191,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1188,7 +1200,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1809,7 +1821,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -1978,6 +2002,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -1988,7 +2016,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2008,7 +2036,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2016,7 +2044,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2024,11 +2052,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2042,15 +2070,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2059,22 +2087,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2092,10 +2120,10 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c28bd749b..10adacf11 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: 2017-06-06 13:55+0000\n"
 "Last-Translator: Александр Киль <shorrey at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -260,7 +260,7 @@ msgstr "Нельзя использовать '/' в имени снимка"
 msgid "(none)"
 msgstr "(пусто)"
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr "ПСЕВДОНИМ"
 
@@ -277,30 +277,34 @@ msgstr "ARCH"
 msgid "ARCHITECTURE"
 msgstr "АРХИТЕКТУРА"
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr "Принять сертификат"
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr "Пароль администратора для %s: "
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr "Псевдонимы:"
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr "Архитектура: %s"
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr "Авто-обновление: %s"
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -353,12 +357,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr "Сертификат клиента хранится на сервере: "
 
@@ -374,7 +378,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -410,17 +414,17 @@ msgstr "Копировать псевдонимы из источника"
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr "Копирование образа: %s"
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 #, fuzzy
 msgid "Could not create config dir"
 msgstr "Не удалось создать каталог сертификата сервера"
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr "Не удалось создать каталог сертификата сервера"
 
@@ -428,7 +432,7 @@ msgstr "Не удалось создать каталог сертификата
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -442,7 +446,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -470,7 +474,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -524,16 +528,16 @@ msgstr "Копирование образа: %s"
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, fuzzy, c-format
 msgid "Exporting the image: %s"
 msgstr "Копирование образа: %s"
@@ -542,7 +546,7 @@ msgstr "Копирование образа: %s"
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -579,7 +583,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -604,7 +608,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -632,32 +636,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -701,12 +709,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -755,7 +763,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -763,12 +771,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -820,11 +828,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -852,11 +860,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -876,7 +884,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -894,7 +902,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -906,6 +914,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -949,15 +961,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -966,12 +978,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, fuzzy, c-format
 msgid "Refreshing the image: %s"
 msgstr "Копирование образа: %s"
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -997,7 +1009,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -1022,7 +1034,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -1030,15 +1042,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -1070,7 +1082,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -1084,11 +1096,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1102,7 +1114,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1215,7 +1227,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1240,7 +1252,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1262,7 +1274,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1274,7 +1286,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1283,7 +1295,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1912,7 +1924,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -2081,6 +2105,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -2091,7 +2119,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2111,7 +2139,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2119,7 +2147,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2127,11 +2155,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2145,15 +2173,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2162,22 +2190,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2195,11 +2223,11 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr "да"
 
diff --git a/po/sr.po b/po/sr.po
index 332a2042f..cbb72dec6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -171,7 +171,7 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -187,30 +187,34 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -262,12 +266,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr ""
 
@@ -283,7 +287,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -319,16 +323,16 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid "Could not create config dir"
 msgstr ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -336,7 +340,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -350,7 +354,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -378,7 +382,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -431,16 +435,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -449,7 +453,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -486,7 +490,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -511,7 +515,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -539,32 +543,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -608,12 +616,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -661,7 +669,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -669,12 +677,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -725,11 +733,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -757,11 +765,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -781,7 +789,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -799,7 +807,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -811,6 +819,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -854,15 +866,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -871,12 +883,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -902,7 +914,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -927,7 +939,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -935,15 +947,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -975,7 +987,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -989,11 +1001,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1007,7 +1019,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1120,7 +1132,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1145,7 +1157,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1179,7 +1191,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1188,7 +1200,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1809,7 +1821,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -1978,6 +2002,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -1988,7 +2016,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2008,7 +2036,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2016,7 +2044,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2024,11 +2052,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2042,15 +2070,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2059,22 +2087,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2092,10 +2120,10 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 8db0134f7..ff51705c1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -171,7 +171,7 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -187,30 +187,34 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -262,12 +266,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr ""
 
@@ -283,7 +287,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -319,16 +323,16 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid "Could not create config dir"
 msgstr ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -336,7 +340,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -350,7 +354,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -378,7 +382,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -431,16 +435,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -449,7 +453,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -486,7 +490,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -511,7 +515,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -539,32 +543,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -608,12 +616,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -661,7 +669,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -669,12 +677,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -725,11 +733,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -757,11 +765,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -781,7 +789,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -799,7 +807,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -811,6 +819,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -854,15 +866,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -871,12 +883,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -902,7 +914,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -927,7 +939,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -935,15 +947,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -975,7 +987,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -989,11 +1001,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1007,7 +1019,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1120,7 +1132,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1145,7 +1157,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1179,7 +1191,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1188,7 +1200,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1809,7 +1821,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -1978,6 +2002,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -1988,7 +2016,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2008,7 +2036,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2016,7 +2044,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2024,11 +2052,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2042,15 +2070,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2059,22 +2087,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2092,10 +2120,10 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index bf77769d9..0921fd81d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -171,7 +171,7 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -187,30 +187,34 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -262,12 +266,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr ""
 
@@ -283,7 +287,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -319,16 +323,16 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid "Could not create config dir"
 msgstr ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -336,7 +340,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -350,7 +354,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -378,7 +382,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -431,16 +435,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -449,7 +453,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -486,7 +490,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -511,7 +515,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -539,32 +543,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -608,12 +616,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -661,7 +669,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -669,12 +677,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -725,11 +733,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -757,11 +765,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -781,7 +789,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -799,7 +807,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -811,6 +819,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -854,15 +866,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -871,12 +883,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -902,7 +914,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -927,7 +939,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -935,15 +947,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -975,7 +987,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -989,11 +1001,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1007,7 +1019,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1120,7 +1132,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1145,7 +1157,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1179,7 +1191,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1188,7 +1200,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1809,7 +1821,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -1978,6 +2002,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -1988,7 +2016,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2008,7 +2036,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2016,7 +2044,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2024,11 +2052,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2042,15 +2070,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2059,22 +2087,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2092,10 +2120,10 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 7f3239585..6188f6ba2 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -171,7 +171,7 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -187,30 +187,34 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -262,12 +266,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr ""
 
@@ -283,7 +287,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -319,16 +323,16 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid "Could not create config dir"
 msgstr ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -336,7 +340,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -350,7 +354,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -378,7 +382,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -431,16 +435,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -449,7 +453,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -486,7 +490,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -511,7 +515,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -539,32 +543,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -608,12 +616,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -661,7 +669,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -669,12 +677,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -725,11 +733,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -757,11 +765,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -781,7 +789,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -799,7 +807,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -811,6 +819,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -854,15 +866,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -871,12 +883,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -902,7 +914,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -927,7 +939,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -935,15 +947,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -975,7 +987,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -989,11 +1001,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1007,7 +1019,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1120,7 +1132,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1145,7 +1157,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1179,7 +1191,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1188,7 +1200,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1809,7 +1821,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -1978,6 +2002,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -1988,7 +2016,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2008,7 +2036,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2016,7 +2044,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2024,11 +2052,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2042,15 +2070,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2059,22 +2087,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2092,10 +2120,10 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index 8d64fd0ab..79f5d47da 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-07-27 18:42-0400\n"
+"POT-Creation-Date: 2017-08-03 23:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -171,7 +171,7 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: lxc/image.go:227 lxc/image.go:1089
+#: lxc/image.go:227 lxc/image.go:1088
 msgid "ALIAS"
 msgstr ""
 
@@ -187,30 +187,34 @@ msgstr ""
 msgid "ARCHITECTURE"
 msgstr ""
 
-#: lxc/remote.go:67
+#: lxc/remote.go:68
 msgid "Accept certificate"
 msgstr ""
 
-#: lxc/remote.go:289
+#: lxc/query.go:38
+msgid "Action (defaults to GET)"
+msgstr ""
+
+#: lxc/remote.go:306
 #, c-format
 msgid "Admin password for %s: "
 msgstr ""
 
-#: lxc/image.go:593
+#: lxc/image.go:592
 msgid "Aliases:"
 msgstr ""
 
-#: lxc/image.go:571 lxc/info.go:104
+#: lxc/image.go:570 lxc/info.go:104
 #, c-format
 msgid "Architecture: %s"
 msgstr ""
 
-#: lxc/image.go:601
+#: lxc/image.go:600
 #, c-format
 msgid "Auto update: %s"
 msgstr ""
 
-#: lxc/image.go:675
+#: lxc/image.go:674
 #, c-format
 msgid "Bad property: %s"
 msgstr ""
@@ -262,12 +266,12 @@ msgstr ""
 msgid "Cannot provide container name to list"
 msgstr ""
 
-#: lxc/remote.go:236
+#: lxc/remote.go:242
 #, c-format
 msgid "Certificate fingerprint: %s"
 msgstr ""
 
-#: lxc/remote.go:324
+#: lxc/remote.go:341
 msgid "Client certificate stored at server: "
 msgstr ""
 
@@ -283,7 +287,7 @@ msgstr ""
 msgid "Config key/value to apply to the new container"
 msgstr ""
 
-#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1144
+#: lxc/config.go:816 lxc/config.go:881 lxc/config.go:1331 lxc/image.go:1143
 #: lxc/network.go:418 lxc/profile.go:267 lxc/storage.go:576 lxc/storage.go:935
 #, c-format
 msgid "Config parsing error: %s"
@@ -319,16 +323,16 @@ msgstr ""
 msgid "Copy the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:430
+#: lxc/image.go:429
 #, c-format
 msgid "Copying the image: %s"
 msgstr ""
 
-#: lxc/remote.go:78
+#: lxc/remote.go:79
 msgid "Could not create config dir"
 msgstr ""
 
-#: lxc/remote.go:251
+#: lxc/remote.go:257
 msgid "Could not create server cert dir"
 msgstr ""
 
@@ -336,7 +340,7 @@ msgstr ""
 msgid "Create any directories necessary"
 msgstr ""
 
-#: lxc/image.go:576 lxc/info.go:106
+#: lxc/image.go:575 lxc/info.go:106
 #, c-format
 msgid "Created: %s"
 msgstr ""
@@ -350,7 +354,7 @@ msgstr ""
 msgid "Creating the container"
 msgstr ""
 
-#: lxc/image.go:231 lxc/image.go:1091 lxc/list.go:463 lxc/network.go:507
+#: lxc/image.go:231 lxc/image.go:1090 lxc/list.go:463 lxc/network.go:507
 #: lxc/storage.go:654 lxc/storage.go:749
 msgid "DESCRIPTION"
 msgstr ""
@@ -378,7 +382,7 @@ msgstr ""
 msgid "Device already exists: %s"
 msgstr ""
 
-#: lxc/image.go:1243
+#: lxc/image.go:1242
 msgid "Directory import is not available on this platform"
 msgstr ""
 
@@ -431,16 +435,16 @@ msgstr ""
 msgid "Event type to listen for"
 msgstr ""
 
-#: lxc/image.go:580
+#: lxc/image.go:579
 #, c-format
 msgid "Expires: %s"
 msgstr ""
 
-#: lxc/image.go:582
+#: lxc/image.go:581
 msgid "Expires: never"
 msgstr ""
 
-#: lxc/image.go:885
+#: lxc/image.go:884
 #, c-format
 msgid "Exporting the image: %s"
 msgstr ""
@@ -449,7 +453,7 @@ msgstr ""
 msgid "FILENAME"
 msgstr ""
 
-#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1090
+#: lxc/config.go:399 lxc/image.go:229 lxc/image.go:1089
 msgid "FINGERPRINT"
 msgstr ""
 
@@ -486,7 +490,7 @@ msgstr ""
 msgid "Fast mode (same as --columns=nsacPt)"
 msgstr ""
 
-#: lxc/image.go:569
+#: lxc/image.go:568
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
@@ -511,7 +515,7 @@ msgstr ""
 msgid "Format (csv|json|table|yaml)"
 msgstr ""
 
-#: lxc/remote.go:89
+#: lxc/remote.go:90
 msgid "Generating a client certificate. This may take a minute..."
 msgstr ""
 
@@ -539,32 +543,36 @@ msgstr ""
 msgid "Ignore the container state (only for start)"
 msgstr ""
 
-#: lxc/image.go:532
+#: lxc/image.go:531
 msgid "Image already up to date."
 msgstr ""
 
-#: lxc/image.go:444
+#: lxc/image.go:443
 msgid "Image copied successfully!"
 msgstr ""
 
-#: lxc/image.go:935
+#: lxc/image.go:934
 msgid "Image exported successfully!"
 msgstr ""
 
-#: lxc/image.go:742
+#: lxc/image.go:741
 #, c-format
 msgid "Image imported with fingerprint: %s"
 msgstr ""
 
-#: lxc/image.go:530
+#: lxc/image.go:529
 msgid "Image refreshed successfully!"
 msgstr ""
 
+#: lxc/query.go:39
+msgid "Input data"
+msgstr ""
+
 #: lxc/init.go:147
 msgid "Instance type"
 msgstr ""
 
-#: lxc/remote.go:159
+#: lxc/remote.go:160
 #, c-format
 msgid "Invalid URL scheme \"%s\" in \"%s\""
 msgstr ""
@@ -608,12 +616,12 @@ msgstr ""
 msgid "LXD socket not found; is LXD installed and running?"
 msgstr ""
 
-#: lxc/image.go:585
+#: lxc/image.go:584
 #, c-format
 msgid "Last used: %s"
 msgstr ""
 
-#: lxc/image.go:587
+#: lxc/image.go:586
 msgid "Last used: never"
 msgstr ""
 
@@ -661,7 +669,7 @@ msgstr ""
 msgid "Move the container without its snapshots"
 msgstr ""
 
-#: lxc/image.go:1245
+#: lxc/image.go:1244
 msgid "Must run as root to import from directory"
 msgstr ""
 
@@ -669,12 +677,12 @@ msgstr ""
 msgid "Must supply container name for: "
 msgstr ""
 
-#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:414
+#: lxc/list.go:465 lxc/network.go:504 lxc/profile.go:555 lxc/remote.go:431
 #: lxc/storage.go:653 lxc/storage.go:748
 msgid "NAME"
 msgstr ""
 
-#: lxc/network.go:490 lxc/remote.go:388 lxc/remote.go:393
+#: lxc/network.go:490 lxc/remote.go:405 lxc/remote.go:410
 msgid "NO"
 msgstr ""
 
@@ -725,11 +733,11 @@ msgstr ""
 msgid "Only \"custom\" volumes can be attached to containers."
 msgstr ""
 
-#: lxc/remote.go:144
+#: lxc/remote.go:145
 msgid "Only https URLs are supported for simplestreams"
 msgstr ""
 
-#: lxc/image.go:656
+#: lxc/image.go:655
 msgid "Only https:// is supported for remote image import."
 msgstr ""
 
@@ -757,11 +765,11 @@ msgstr ""
 msgid "PROFILES"
 msgstr ""
 
-#: lxc/remote.go:416
+#: lxc/remote.go:433
 msgid "PROTOCOL"
 msgstr ""
 
-#: lxc/image.go:230 lxc/remote.go:417
+#: lxc/image.go:230 lxc/remote.go:434
 msgid "PUBLIC"
 msgstr ""
 
@@ -781,7 +789,7 @@ msgstr ""
 msgid "Path to an alternate server directory"
 msgstr ""
 
-#: lxc/main.go:226
+#: lxc/main.go:227
 msgid "Pause containers."
 msgstr ""
 
@@ -799,7 +807,7 @@ msgid "Press enter to open the editor again"
 msgstr ""
 
 #: lxc/config.go:817 lxc/config.go:882 lxc/config.go:1332 lxc/config.go:1382
-#: lxc/image.go:1145
+#: lxc/image.go:1144
 msgid "Press enter to start the editor again"
 msgstr ""
 
@@ -811,6 +819,10 @@ msgstr ""
 msgid "Print less common commands"
 msgstr ""
 
+#: lxc/query.go:37
+msgid "Print the raw response"
+msgstr ""
+
 #: lxc/help.go:74
 msgid "Print verbose information"
 msgstr ""
@@ -854,15 +866,15 @@ msgstr ""
 msgid "Profiles: %s"
 msgstr ""
 
-#: lxc/image.go:589
+#: lxc/image.go:588
 msgid "Properties:"
 msgstr ""
 
-#: lxc/remote.go:70
+#: lxc/remote.go:71
 msgid "Public image server"
 msgstr ""
 
-#: lxc/image.go:572
+#: lxc/image.go:571
 #, c-format
 msgid "Public: %s"
 msgstr ""
@@ -871,12 +883,12 @@ msgstr ""
 msgid "Recursively push or pull files"
 msgstr ""
 
-#: lxc/image.go:510
+#: lxc/image.go:509
 #, c-format
 msgid "Refreshing the image: %s"
 msgstr ""
 
-#: lxc/remote.go:68
+#: lxc/remote.go:69
 msgid "Remote admin password"
 msgstr ""
 
@@ -902,7 +914,7 @@ msgstr ""
 msgid "Resources:"
 msgstr ""
 
-#: lxc/main.go:234
+#: lxc/main.go:235
 msgid "Restart containers."
 msgstr ""
 
@@ -927,7 +939,7 @@ msgstr ""
 msgid "STATE"
 msgstr ""
 
-#: lxc/remote.go:418
+#: lxc/remote.go:435
 msgid "STATIC"
 msgstr ""
 
@@ -935,15 +947,15 @@ msgstr ""
 msgid "STORAGE POOL"
 msgstr ""
 
-#: lxc/remote.go:244
+#: lxc/remote.go:250
 msgid "Server certificate NACKed by user"
 msgstr ""
 
-#: lxc/remote.go:321
+#: lxc/remote.go:338
 msgid "Server doesn't trust us after adding our cert"
 msgstr ""
 
-#: lxc/remote.go:69
+#: lxc/remote.go:70
 msgid "Server protocol (lxd or simplestreams)"
 msgstr ""
 
@@ -975,7 +987,7 @@ msgstr ""
 msgid "Show the expanded configuration"
 msgstr ""
 
-#: lxc/image.go:570
+#: lxc/image.go:569
 #, c-format
 msgid "Size: %.2fMB"
 msgstr ""
@@ -989,11 +1001,11 @@ msgstr ""
 msgid "Some containers failed to %s"
 msgstr ""
 
-#: lxc/image.go:603
+#: lxc/image.go:602
 msgid "Source:"
 msgstr ""
 
-#: lxc/main.go:244
+#: lxc/main.go:245
 msgid "Start containers."
 msgstr ""
 
@@ -1007,7 +1019,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: lxc/main.go:250
+#: lxc/main.go:251
 msgid "Stop containers."
 msgstr ""
 
@@ -1120,7 +1132,7 @@ msgstr ""
 msgid "Time to wait for the container before killing it"
 msgstr ""
 
-#: lxc/image.go:573
+#: lxc/image.go:572
 msgid "Timestamps:"
 msgstr ""
 
@@ -1145,7 +1157,7 @@ msgstr ""
 msgid "Transferring container: %s"
 msgstr ""
 
-#: lxc/image.go:681
+#: lxc/image.go:680
 #, c-format
 msgid "Transferring image: %s"
 msgstr ""
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "UPLOAD DATE"
 msgstr ""
 
-#: lxc/remote.go:415
+#: lxc/remote.go:432
 msgid "URL"
 msgstr ""
 
@@ -1179,7 +1191,7 @@ msgstr ""
 msgid "Unable to find help2man."
 msgstr ""
 
-#: lxc/remote.go:119
+#: lxc/remote.go:120
 msgid "Unable to read remote TLS certificate"
 msgstr ""
 
@@ -1188,7 +1200,7 @@ msgstr ""
 msgid "Unknown file type '%s'"
 msgstr ""
 
-#: lxc/image.go:578
+#: lxc/image.go:577
 #, c-format
 msgid "Uploaded: %s"
 msgstr ""
@@ -1809,7 +1821,19 @@ msgid ""
 "Publish containers as images."
 msgstr ""
 
-#: lxc/remote.go:39
+#: lxc/query.go:25
+msgid ""
+"Usage: lxc query [-X <action>] [-d <data>] [--wait] [--raw] [<remote>:]<API "
+"path>\n"
+"\n"
+"Send a raw query to LXD.\n"
+"\n"
+"*Examples*\n"
+"lxc query -X DELETE --wait /1.0/containers/c1\n"
+"    Delete local container \"c1\"."
+msgstr ""
+
+#: lxc/remote.go:40
 msgid ""
 "Usage: lxc remote <subcommand> [options]\n"
 "\n"
@@ -1978,6 +2002,10 @@ msgid ""
 "running."
 msgstr ""
 
+#: lxc/query.go:36
+msgid "Wait for the operation to complete"
+msgstr ""
+
 #: lxc/restore.go:38
 msgid ""
 "Whether or not to restore the container's running state from snapshot (if "
@@ -1988,7 +2016,7 @@ msgstr ""
 msgid "Whether or not to snapshot the container's running state"
 msgstr ""
 
-#: lxc/network.go:492 lxc/remote.go:390 lxc/remote.go:395
+#: lxc/network.go:492 lxc/remote.go:407 lxc/remote.go:412
 msgid "YES"
 msgstr ""
 
@@ -2008,7 +2036,7 @@ msgstr ""
 msgid "`lxc config profile` is deprecated, please use `lxc profile`"
 msgstr ""
 
-#: lxc/remote.go:378
+#: lxc/remote.go:395
 msgid "can't remove the default remote"
 msgstr ""
 
@@ -2016,7 +2044,7 @@ msgstr ""
 msgid "can't supply uid/gid/mode in recursive mode"
 msgstr ""
 
-#: lxc/remote.go:404
+#: lxc/remote.go:421
 msgid "default"
 msgstr ""
 
@@ -2024,11 +2052,11 @@ msgstr ""
 msgid "didn't get any affected image, container or snapshot from server"
 msgstr ""
 
-#: lxc/image.go:564
+#: lxc/image.go:563
 msgid "disabled"
 msgstr ""
 
-#: lxc/image.go:566
+#: lxc/image.go:565
 msgid "enabled"
 msgstr ""
 
@@ -2042,15 +2070,15 @@ msgstr ""
 msgid "error: unknown command: %s"
 msgstr ""
 
-#: lxc/image.go:206 lxc/image.go:559
+#: lxc/image.go:206 lxc/image.go:558
 msgid "no"
 msgstr ""
 
-#: lxc/remote.go:237
+#: lxc/remote.go:243
 msgid "ok (y/n)?"
 msgstr ""
 
-#: lxc/main.go:355 lxc/main.go:359
+#: lxc/main.go:356 lxc/main.go:360
 #, c-format
 msgid "processing aliases failed %s\n"
 msgstr ""
@@ -2059,22 +2087,22 @@ msgstr ""
 msgid "recursive edit doesn't make sense :("
 msgstr ""
 
-#: lxc/remote.go:440
+#: lxc/remote.go:457
 #, c-format
 msgid "remote %s already exists"
 msgstr ""
 
-#: lxc/remote.go:370 lxc/remote.go:432 lxc/remote.go:467 lxc/remote.go:483
+#: lxc/remote.go:387 lxc/remote.go:449 lxc/remote.go:484 lxc/remote.go:500
 #, c-format
 msgid "remote %s doesn't exist"
 msgstr ""
 
-#: lxc/remote.go:353
+#: lxc/remote.go:370
 #, c-format
 msgid "remote %s exists as <%s>"
 msgstr ""
 
-#: lxc/remote.go:374 lxc/remote.go:436 lxc/remote.go:471
+#: lxc/remote.go:391 lxc/remote.go:453 lxc/remote.go:488
 #, c-format
 msgid "remote %s is static and cannot be modified"
 msgstr ""
@@ -2092,10 +2120,10 @@ msgstr ""
 msgid "taken at %s"
 msgstr ""
 
-#: lxc/main.go:286
+#: lxc/main.go:287
 msgid "wrong number of subcommand arguments"
 msgstr ""
 
-#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:561
+#: lxc/delete.go:45 lxc/image.go:204 lxc/image.go:560
 msgid "yes"
 msgstr ""


More information about the lxc-devel mailing list