[lxc-devel] [lxd/master] Add support for os.SyscallError in client
sean-jc on Github
lxc-bot at linuxcontainers.org
Thu Jun 2 19:21:25 UTC 2016
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 687 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160602/1f2ff872/attachment.bin>
-------------- next part --------------
From 07514e20454b826a7dc3c9924a884193d9502ff9 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <sean.j.christopherson at intel.com>
Date: Thu, 2 Jun 2016 10:02:15 -0700
Subject: [PATCH] Add support for os.SyscallError in client
Modify the client's error handling to support os.SyscallErrors. Move
the error handling to an exported function in the client so that the
code can be reused by other projects, e.g. juju.
Add a message to the 'funcs starting with empty line' test to help
users with bad habits understand what they did wrong.
Signed-off-by: Sean Christopherson <sean.j.christopherson at intel.com>
---
client.go | 48 ++++++++++
lxc/main.go | 26 +----
po/de.po | 171 +++++++++++++++++----------------
po/fr.po | 171 +++++++++++++++++----------------
po/ja.po | 210 ++++++++++++++++++++++-------------------
po/lxd.pot | 38 ++++----
test/suites/static_analysis.sh | 2 +-
7 files changed, 360 insertions(+), 306 deletions(-)
diff --git a/client.go b/client.go
index db12ed0..43de0cc 100644
--- a/client.go
+++ b/client.go
@@ -19,10 +19,12 @@ import (
"path/filepath"
"strconv"
"strings"
+ "syscall"
"github.com/gorilla/websocket"
"github.com/lxc/lxd/shared"
+ "github.com/lxc/lxd/shared/i18n"
)
// Client can talk to a LXD daemon.
@@ -513,6 +515,52 @@ func (c *Client) GetServerConfig() (*Response, error) {
return c.baseGet(c.url(shared.APIVersion))
}
+// GetMessageFromErr converts an error received by the client into a more
+// user-friendly message. In addition to the prettified message, returns
+// a bool indicating whether or not LXD appears to be installed.
+func GetMessageFromErr(err error) (bool, string) {
+ msg := fmt.Sprintf(i18n.G("error: %v"), err)
+
+ t, ok := err.(*url.Error)
+ if !ok {
+ return false, msg
+ }
+
+ u, ok := t.Err.(*net.OpError)
+ if !ok {
+ return false, msg
+ }
+
+ if u.Op == "dial" && u.Net == "unix" {
+ var lxdErr error
+
+ sysErr, ok := u.Err.(*os.SyscallError)
+ if ok {
+ lxdErr = sysErr.Err
+ } else {
+ // Try a syscall.Errno as that is what's returned for CentOS
+ errno, ok := u.Err.(syscall.Errno)
+ if !ok {
+ return false, msg
+ }
+
+ lxdErr = errno
+ msg = fmt.Sprintf("%d %s", uintptr(errno), errno.Error())
+ }
+
+ switch lxdErr {
+ case syscall.ENOENT:
+ return false, i18n.G("LXD socket not found; is LXD installed and running?")
+ case syscall.ECONNREFUSED:
+ return true, i18n.G("Connection refused; is LXD running?")
+ case syscall.EACCES:
+ return true, i18n.G("Permisson denied, are you in the lxd group?")
+ }
+ }
+
+ return false, msg
+}
+
func (c *Client) AmTrusted() bool {
resp, err := c.GetServerConfig()
if err != nil {
diff --git a/lxc/main.go b/lxc/main.go
index fa49434..9930a6d 100644
--- a/lxc/main.go
+++ b/lxc/main.go
@@ -2,8 +2,6 @@ package main
import (
"fmt"
- "net"
- "net/url"
"os"
"os/exec"
"path"
@@ -21,29 +19,7 @@ var configPath string
func main() {
if err := run(); err != nil {
- // The action we take depends on the error we get.
- msg := fmt.Sprintf(i18n.G("error: %v"), err)
- switch t := err.(type) {
- case *url.Error:
- switch u := t.Err.(type) {
- case *net.OpError:
- if u.Op == "dial" && u.Net == "unix" {
- switch errno := u.Err.(type) {
- case syscall.Errno:
- switch errno {
- case syscall.ENOENT:
- msg = i18n.G("LXD socket not found; is LXD running?")
- case syscall.ECONNREFUSED:
- msg = i18n.G("Connection refused; is LXD running?")
- case syscall.EACCES:
- msg = i18n.G("Permisson denied, are you in the lxd group?")
- default:
- msg = fmt.Sprintf("%d %s", uintptr(errno), errno.Error())
- }
- }
- }
- }
- }
+ _, msg := lxd.GetMessageFromErr(err)
fmt.Fprintln(os.Stderr, fmt.Sprintf("%s", msg))
os.Exit(1)
diff --git a/po/de.po b/po/de.po
index 38d1d3e..205ae51 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LXD\n"
"Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2016-04-25 14:47-0500\n"
+"POT-Creation-Date: 2016-06-02 10:13-0700\n"
"PO-Revision-Date: 2015-06-13 06:10+0200\n"
"Last-Translator: Felix Engelmann <felix-lxd at nlogn.org>\n"
"Language-Team: \n"
@@ -67,7 +67,7 @@ msgstr ""
"###\n"
"### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
-#: lxc/image.go:83
+#: lxc/image.go:85
#, fuzzy
msgid ""
"### This is a yaml representation of the image properties.\n"
@@ -123,7 +123,7 @@ msgstr ""
"###\n"
"### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n"
-#: lxc/image.go:583
+#: lxc/image.go:597
#, c-format
msgid "%s (%d more)"
msgstr ""
@@ -133,15 +133,15 @@ msgstr ""
msgid "'/' not allowed in snapshot name"
msgstr "'/' ist kein gültiges Zeichen im Namen eines Sicherungspunktes\n"
-#: lxc/profile.go:251
+#: lxc/profile.go:253
msgid "(none)"
msgstr ""
-#: lxc/image.go:604 lxc/image.go:633
+#: lxc/image.go:618 lxc/image.go:660
msgid "ALIAS"
msgstr ""
-#: lxc/image.go:608
+#: lxc/image.go:622
msgid "ARCH"
msgstr ""
@@ -158,7 +158,7 @@ msgstr "Akzeptiere Zertifikat"
msgid "Admin password for %s: "
msgstr "Administrator Passwort für %s: "
-#: lxc/image.go:347
+#: lxc/image.go:350
#, fuzzy
msgid "Aliases:"
msgstr "Aliasse:\n"
@@ -167,12 +167,12 @@ msgstr "Aliasse:\n"
msgid "An environment variable of the form HOME=/home/foo"
msgstr ""
-#: lxc/image.go:330 lxc/info.go:90
+#: lxc/image.go:333 lxc/info.go:90
#, fuzzy, c-format
msgid "Architecture: %s"
msgstr "Architektur: %s\n"
-#: lxc/image.go:351
+#: lxc/image.go:354
#, c-format
msgid "Auto update: %s"
msgstr ""
@@ -207,7 +207,7 @@ msgstr ""
msgid "Can't unset key '%s', it's not currently set."
msgstr ""
-#: lxc/profile.go:417
+#: lxc/profile.go:419
msgid "Cannot provide container name to list"
msgstr ""
@@ -240,12 +240,12 @@ msgstr ""
msgid "Config key/value to apply to the new container"
msgstr "kann nicht zum selben Container Namen kopieren"
-#: lxc/config.go:500 lxc/config.go:565 lxc/image.go:687 lxc/profile.go:215
+#: lxc/config.go:527 lxc/config.go:592 lxc/image.go:714 lxc/profile.go:217
#, fuzzy, c-format
msgid "Config parsing error: %s"
msgstr "YAML Analyse Fehler %v\n"
-#: lxc/main.go:37
+#: client.go:558
msgid "Connection refused; is LXD running?"
msgstr ""
@@ -263,7 +263,7 @@ msgstr ""
msgid "Container published with fingerprint: %s"
msgstr "Abbild mit Fingerabdruck %s importiert\n"
-#: lxc/image.go:155
+#: lxc/image.go:157
msgid "Copy aliases from source"
msgstr "Kopiere Aliasse von der Quelle"
@@ -279,7 +279,7 @@ msgstr ""
"\n"
"lxc copy <Quelle> <Ziel>\n"
-#: lxc/image.go:268
+#: lxc/image.go:271
#, c-format
msgid "Copying the image: %s"
msgstr ""
@@ -308,7 +308,7 @@ msgid ""
"lxc snapshot u1 snap0"
msgstr ""
-#: lxc/image.go:335 lxc/info.go:92
+#: lxc/image.go:338 lxc/info.go:92
#, c-format
msgid "Created: %s"
msgstr ""
@@ -323,7 +323,7 @@ msgstr ""
msgid "Creating the container"
msgstr "kann nicht zum selben Container Namen kopieren"
-#: lxc/image.go:607 lxc/image.go:635
+#: lxc/image.go:621 lxc/image.go:662
msgid "DESCRIPTION"
msgstr ""
@@ -343,12 +343,12 @@ msgstr ""
"Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
"Daten (Konfiguration, Sicherungspunkte, ...).\n"
-#: lxc/config.go:617
+#: lxc/config.go:644
#, fuzzy, c-format
msgid "Device %s added to %s"
msgstr "Gerät %s wurde zu %s hinzugefügt\n"
-#: lxc/config.go:804
+#: lxc/config.go:831
#, fuzzy, c-format
msgid "Device %s removed from %s"
msgstr "Gerät %s wurde von %s entfernt\n"
@@ -361,11 +361,11 @@ msgstr ""
msgid "EXPIRY DATE"
msgstr ""
-#: lxc/main.go:55
+#: lxc/main.go:31
msgid "Enables debug mode."
msgstr "Aktiviert Debug Modus"
-#: lxc/main.go:54
+#: lxc/main.go:30
msgid "Enables verbose mode."
msgstr "Aktiviert ausführliche Ausgabe"
@@ -397,16 +397,16 @@ msgstr ""
"\n"
"lxc exec <Container> [--env EDITOR=/usr/bin/vim]... <Befehl>\n"
-#: lxc/image.go:339
+#: lxc/image.go:342
#, c-format
msgid "Expires: %s"
msgstr ""
-#: lxc/image.go:341
+#: lxc/image.go:344
msgid "Expires: never"
msgstr ""
-#: lxc/config.go:269 lxc/image.go:605 lxc/image.go:634
+#: lxc/config.go:269 lxc/image.go:619 lxc/image.go:661
msgid "FINGERPRINT"
msgstr ""
@@ -414,7 +414,7 @@ msgstr ""
msgid "Fast mode (same as --columns=nsacPt"
msgstr ""
-#: lxc/image.go:328
+#: lxc/image.go:331
#, fuzzy, c-format
msgid "Fingerprint: %s"
msgstr "Fingerabdruck: %s\n"
@@ -438,15 +438,15 @@ msgstr "Herunterfahren des Containers erzwingen."
msgid "Force the removal of stopped containers."
msgstr ""
-#: lxc/main.go:56
+#: lxc/main.go:32
msgid "Force using the local unix socket."
msgstr ""
-#: lxc/list.go:101
+#: lxc/image.go:160 lxc/list.go:101
msgid "Format"
msgstr ""
-#: lxc/main.go:138
+#: lxc/main.go:114
#, fuzzy
msgid "Generating a client certificate. This may take a minute..."
msgstr "Generiere Nutzerzertifikat. Dies kann wenige Minuten dauern...\n"
@@ -463,12 +463,12 @@ msgstr ""
msgid "ISSUE DATE"
msgstr ""
-#: lxc/main.go:146
+#: lxc/main.go:122
msgid ""
"If this is your first time using LXD, you should also run: sudo lxd init"
msgstr ""
-#: lxc/main.go:57
+#: lxc/main.go:33
msgid "Ignore aliases when determining what command to run."
msgstr ""
@@ -477,11 +477,11 @@ msgstr ""
msgid "Ignore the container state (only for start)."
msgstr "Herunterfahren des Containers erzwingen."
-#: lxc/image.go:273
+#: lxc/image.go:276
msgid "Image copied successfully!"
msgstr ""
-#: lxc/image.go:419
+#: lxc/image.go:422
#, fuzzy, c-format
msgid "Image imported with fingerprint: %s"
msgstr "Abbild mit Fingerabdruck %s importiert\n"
@@ -537,12 +537,12 @@ msgstr "Ungültiges Ziel %s"
msgid "Ips:"
msgstr ""
-#: lxc/image.go:156
+#: lxc/image.go:158
msgid "Keep the image up to date after initial copy"
msgstr ""
-#: lxc/main.go:35
-msgid "LXD socket not found; is LXD running?"
+#: client.go:556
+msgid "LXD socket not found; is LXD installed and running?"
msgstr ""
#: lxc/launch.go:22
@@ -646,7 +646,7 @@ msgstr ""
msgid "Log:"
msgstr ""
-#: lxc/image.go:154
+#: lxc/image.go:156
msgid "Make image public"
msgstr "Veröffentliche Abbild"
@@ -674,16 +674,21 @@ msgid ""
" cat profile.yml | lxc profile edit <profile> # read from "
"profile.yml\n"
"\n"
-"lxc profile apply <container> <profiles>\n"
-" Apply a comma-separated list of profiles to a container, in order.\n"
+"lxc profile assign <container> <profiles>\n"
+" Assign a comma-separated list of profiles to a container, in order.\n"
" All profiles passed in this call (and only those) will be applied\n"
-" to the specified container.\n"
-" Example: lxc profile apply foo default,bar # Apply default and bar\n"
-" lxc profile apply foo default # Only default is active\n"
-" lxc profile apply '' # no profiles are applied anymore\n"
-" lxc profile apply bar,default # Apply default second now\n"
-"lxc profile apply-add <container> <profile>\n"
-"lxc profile apply-remove <container> <profile>\n"
+" to the specified container, i.e. it sets the list of profiles exactly "
+"to\n"
+" those specified in this command. To add/remove a particular profile from "
+"a\n"
+" container, use {add|remove} below.\n"
+" Example: lxc profile assign foo default,bar # Apply default and bar\n"
+" lxc profile assign foo default # Only default is active\n"
+" lxc profile assign '' # no profiles are applied anymore\n"
+" lxc profile assign bar,default # Apply default second now\n"
+"lxc profile add <container> <profile> # add a profile to a container\n"
+"lxc profile remove <container> <profile> # remove the profile from a "
+"container\n"
"\n"
"Devices:\n"
"lxc profile device list <profile> List "
@@ -889,7 +894,7 @@ msgstr ""
"lxc remote get-default "
"Gibt die Standard Instanz aus.\n"
-#: lxc/image.go:93
+#: lxc/image.go:95
msgid ""
"Manipulate container images.\n"
"\n"
@@ -929,7 +934,7 @@ msgid ""
"lxc image info [remote:]<image>\n"
" Print everything LXD knows about a given image.\n"
"\n"
-"lxc image list [remote:] [filter]\n"
+"lxc image list [remote:] [filter] [--format table|json]\n"
" List images in the LXD image store. Filters may be of the\n"
" <key>=<value> form for property based filtering, or part of the image\n"
" hash or part of the image alias name.\n"
@@ -1019,7 +1024,7 @@ msgstr ""
msgid "Name: %s"
msgstr ""
-#: lxc/image.go:157 lxc/publish.go:33
+#: lxc/image.go:159 lxc/publish.go:33
msgid "New alias to define at target"
msgstr ""
@@ -1036,15 +1041,15 @@ msgstr "Kein Fingerabdruck angegeben."
msgid "Only https URLs are supported for simplestreams"
msgstr ""
-#: lxc/image.go:411
+#: lxc/image.go:414
msgid "Only https:// is supported for remote image import."
msgstr ""
-#: lxc/help.go:63 lxc/main.go:122
+#: lxc/help.go:63 lxc/main.go:98
msgid "Options:"
msgstr ""
-#: lxc/image.go:506
+#: lxc/image.go:518
#, c-format
msgid "Output is in %s"
msgstr ""
@@ -1069,7 +1074,7 @@ msgstr ""
msgid "PROTOCOL"
msgstr ""
-#: lxc/image.go:606 lxc/remote.go:366
+#: lxc/image.go:620 lxc/remote.go:366
msgid "PUBLIC"
msgstr ""
@@ -1091,7 +1096,7 @@ msgstr "Alternatives config Verzeichnis."
msgid "Path to an alternate server directory."
msgstr "Alternatives config Verzeichnis."
-#: lxc/main.go:39
+#: client.go:560
msgid "Permisson denied, are you in the lxd group?"
msgstr ""
@@ -1111,11 +1116,11 @@ msgstr ""
"\n"
"lxd help [—all]\n"
-#: lxc/profile.go:216
+#: lxc/profile.go:218
msgid "Press enter to open the editor again"
msgstr ""
-#: lxc/config.go:501 lxc/config.go:566 lxc/image.go:688
+#: lxc/config.go:528 lxc/config.go:593 lxc/image.go:715
msgid "Press enter to start the editor again"
msgstr ""
@@ -1147,22 +1152,22 @@ msgstr ""
msgid "Processes: %d"
msgstr "Profil %s erstellt\n"
-#: lxc/profile.go:272
+#: lxc/profile.go:274
#, fuzzy, c-format
msgid "Profile %s added to %s"
msgstr "Profil %s wurde auf %s angewandt\n"
-#: lxc/profile.go:167
+#: lxc/profile.go:169
#, fuzzy, c-format
msgid "Profile %s created"
msgstr "Profil %s erstellt\n"
-#: lxc/profile.go:237
+#: lxc/profile.go:239
#, fuzzy, c-format
msgid "Profile %s deleted"
msgstr "Profil %s gelöscht\n"
-#: lxc/profile.go:303
+#: lxc/profile.go:305
#, fuzzy, c-format
msgid "Profile %s removed from %s"
msgstr "Gerät %s wurde von %s entfernt\n"
@@ -1172,7 +1177,7 @@ msgstr "Gerät %s wurde von %s entfernt\n"
msgid "Profile to apply to the new container"
msgstr "kann nicht zum selben Container Namen kopieren"
-#: lxc/profile.go:253
+#: lxc/profile.go:255
#, fuzzy, c-format
msgid "Profiles %s applied to %s"
msgstr "Profil %s wurde auf %s angewandt\n"
@@ -1182,7 +1187,7 @@ msgstr "Profil %s wurde auf %s angewandt\n"
msgid "Profiles: %s"
msgstr "Profil %s erstellt\n"
-#: lxc/image.go:343
+#: lxc/image.go:346
#, fuzzy
msgid "Properties:"
msgstr "Eigenschaften:\n"
@@ -1191,7 +1196,7 @@ msgstr "Eigenschaften:\n"
msgid "Public image server"
msgstr ""
-#: lxc/image.go:331
+#: lxc/image.go:334
#, fuzzy, c-format
msgid "Public: %s"
msgstr "Öffentlich: %s\n"
@@ -1226,7 +1231,7 @@ msgstr ""
msgid "Retrieving image: %s"
msgstr ""
-#: lxc/image.go:609
+#: lxc/image.go:623
msgid "SIZE"
msgstr ""
@@ -1289,7 +1294,7 @@ msgstr "Zeigt alle Befehle (nicht nur die interessanten)"
msgid "Show the container's last 100 log lines?"
msgstr "Zeige die letzten 100 Zeilen Protokoll des Containers?"
-#: lxc/image.go:329
+#: lxc/image.go:332
#, fuzzy, c-format
msgid "Size: %.2fMB"
msgstr "Größe: %.2vMB\n"
@@ -1298,7 +1303,7 @@ msgstr "Größe: %.2vMB\n"
msgid "Snapshots:"
msgstr ""
-#: lxc/image.go:353
+#: lxc/image.go:356
msgid "Source:"
msgstr ""
@@ -1347,8 +1352,8 @@ msgid ""
"restarted."
msgstr ""
-#: lxc/config.go:645 lxc/config.go:657 lxc/config.go:690 lxc/config.go:708
-#: lxc/config.go:746 lxc/config.go:764
+#: lxc/config.go:672 lxc/config.go:684 lxc/config.go:717 lxc/config.go:735
+#: lxc/config.go:773 lxc/config.go:791
#, fuzzy
msgid "The device doesn't exist"
msgstr "entfernte Instanz %s existiert nicht"
@@ -1366,16 +1371,16 @@ msgstr ""
msgid "Time to wait for the container before killing it."
msgstr "Wartezeit bevor der Container gestoppt wird."
-#: lxc/image.go:332
+#: lxc/image.go:335
#, fuzzy
msgid "Timestamps:"
msgstr "Zeitstempel:\n"
-#: lxc/main.go:147
+#: lxc/main.go:123
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
-#: lxc/image.go:402
+#: lxc/image.go:405
#, c-format
msgid "Transferring image: %d%%"
msgstr ""
@@ -1393,7 +1398,7 @@ msgstr ""
msgid "Type: persistent"
msgstr ""
-#: lxc/image.go:610
+#: lxc/image.go:624
msgid "UPLOAD DATE"
msgstr ""
@@ -1405,12 +1410,12 @@ msgstr ""
msgid "Unable to read remote TLS certificate"
msgstr ""
-#: lxc/image.go:337
+#: lxc/image.go:340
#, c-format
msgid "Uploaded: %s"
msgstr ""
-#: lxc/main.go:122
+#: lxc/main.go:98
#, fuzzy, c-format
msgid "Usage: %s"
msgstr ""
@@ -1450,7 +1455,7 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lxc/main.go:66
+#: lxc/main.go:42
msgid "`lxc config profile` is deprecated, please use `lxc profile`"
msgstr ""
@@ -1463,7 +1468,7 @@ msgstr ""
msgid "bad result type from action"
msgstr ""
-#: lxc/copy.go:78
+#: lxc/copy.go:99
msgid "can't copy to the same container name"
msgstr "kann nicht zum selben Container Namen kopieren"
@@ -1479,20 +1484,20 @@ msgstr ""
msgid "didn't get any affected image, container or snapshot from server"
msgstr ""
-#: lxc/image.go:323
+#: lxc/image.go:326
msgid "disabled"
msgstr ""
-#: lxc/image.go:325
+#: lxc/image.go:328
msgid "enabled"
msgstr ""
-#: lxc/main.go:25 lxc/main.go:159
+#: client.go:525 lxc/main.go:135
#, fuzzy, c-format
msgid "error: %v"
msgstr "Fehler: %v\n"
-#: lxc/help.go:40 lxc/main.go:117
+#: lxc/help.go:40 lxc/main.go:93
#, fuzzy, c-format
msgid "error: unknown command: %s"
msgstr "Fehler: unbekannter Befehl: %s\n"
@@ -1501,11 +1506,11 @@ msgstr "Fehler: unbekannter Befehl: %s\n"
msgid "got bad version"
msgstr "Versionskonflikt"
-#: lxc/image.go:318 lxc/image.go:586
+#: lxc/image.go:321 lxc/image.go:600
msgid "no"
msgstr ""
-#: lxc/copy.go:101
+#: lxc/copy.go:122
msgid "not all the profiles from the source exist on the target"
msgstr "nicht alle Profile der Quelle sind am Ziel vorhanden."
@@ -1514,7 +1519,7 @@ msgstr "nicht alle Profile der Quelle sind am Ziel vorhanden."
msgid "ok (y/n)?"
msgstr "OK (y/n)? "
-#: lxc/main.go:266 lxc/main.go:270
+#: lxc/main.go:242 lxc/main.go:246
#, c-format
msgid "processing aliases failed %s\n"
msgstr ""
@@ -1556,11 +1561,11 @@ msgstr ""
msgid "unreachable return reached"
msgstr ""
-#: lxc/main.go:199
+#: lxc/main.go:175
msgid "wrong number of subcommand arguments"
msgstr "falsche Anzahl an Parametern für Unterbefehl"
-#: lxc/delete.go:45 lxc/image.go:320 lxc/image.go:590
+#: lxc/delete.go:45 lxc/image.go:323 lxc/image.go:604
msgid "yes"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 9f74b9d..3242862 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LXD\n"
"Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2016-04-25 14:47-0500\n"
+"POT-Creation-Date: 2016-06-02 10:13-0700\n"
"PO-Revision-Date: 2015-02-26 02:05-0600\n"
"Last-Translator: Stéphane Graber <stgraber at ubuntu.com\n"
"Language-Team: French <fr at li.org>\n"
@@ -49,7 +49,7 @@ msgid ""
"### Note that the name is shown but cannot be changed"
msgstr ""
-#: lxc/image.go:83
+#: lxc/image.go:85
msgid ""
"### This is a yaml representation of the image properties.\n"
"### Any line starting with a '# will be ignored.\n"
@@ -80,7 +80,7 @@ msgid ""
"### Note that the name is shown but cannot be changed"
msgstr ""
-#: lxc/image.go:583
+#: lxc/image.go:597
#, c-format
msgid "%s (%d more)"
msgstr ""
@@ -90,15 +90,15 @@ msgstr ""
msgid "'/' not allowed in snapshot name"
msgstr "'/' n'est pas autorisé dans le nom d'un instantané (snapshot)\n"
-#: lxc/profile.go:251
+#: lxc/profile.go:253
msgid "(none)"
msgstr ""
-#: lxc/image.go:604 lxc/image.go:633
+#: lxc/image.go:618 lxc/image.go:660
msgid "ALIAS"
msgstr ""
-#: lxc/image.go:608
+#: lxc/image.go:622
msgid "ARCH"
msgstr ""
@@ -115,7 +115,7 @@ msgstr ""
msgid "Admin password for %s: "
msgstr "Mot de passe administrateur pour %s: "
-#: lxc/image.go:347
+#: lxc/image.go:350
msgid "Aliases:"
msgstr ""
@@ -123,12 +123,12 @@ msgstr ""
msgid "An environment variable of the form HOME=/home/foo"
msgstr ""
-#: lxc/image.go:330 lxc/info.go:90
+#: lxc/image.go:333 lxc/info.go:90
#, c-format
msgid "Architecture: %s"
msgstr ""
-#: lxc/image.go:351
+#: lxc/image.go:354
#, c-format
msgid "Auto update: %s"
msgstr ""
@@ -163,7 +163,7 @@ msgstr ""
msgid "Can't unset key '%s', it's not currently set."
msgstr ""
-#: lxc/profile.go:417
+#: lxc/profile.go:419
msgid "Cannot provide container name to list"
msgstr ""
@@ -192,12 +192,12 @@ msgstr ""
msgid "Config key/value to apply to the new container"
msgstr ""
-#: lxc/config.go:500 lxc/config.go:565 lxc/image.go:687 lxc/profile.go:215
+#: lxc/config.go:527 lxc/config.go:592 lxc/image.go:714 lxc/profile.go:217
#, fuzzy, c-format
msgid "Config parsing error: %s"
msgstr "erreur: %v\n"
-#: lxc/main.go:37
+#: client.go:558
msgid "Connection refused; is LXD running?"
msgstr ""
@@ -215,7 +215,7 @@ msgstr ""
msgid "Container published with fingerprint: %s"
msgstr "Empreinte du certificat: % x\n"
-#: lxc/image.go:155
+#: lxc/image.go:157
msgid "Copy aliases from source"
msgstr ""
@@ -227,7 +227,7 @@ msgid ""
"ephemeral|e]"
msgstr ""
-#: lxc/image.go:268
+#: lxc/image.go:271
#, c-format
msgid "Copying the image: %s"
msgstr ""
@@ -256,7 +256,7 @@ msgid ""
"lxc snapshot u1 snap0"
msgstr ""
-#: lxc/image.go:335 lxc/info.go:92
+#: lxc/image.go:338 lxc/info.go:92
#, c-format
msgid "Created: %s"
msgstr ""
@@ -270,7 +270,7 @@ msgstr ""
msgid "Creating the container"
msgstr ""
-#: lxc/image.go:607 lxc/image.go:635
+#: lxc/image.go:621 lxc/image.go:662
msgid "DESCRIPTION"
msgstr ""
@@ -285,12 +285,12 @@ msgid ""
"snapshots, ...)."
msgstr ""
-#: lxc/config.go:617
+#: lxc/config.go:644
#, c-format
msgid "Device %s added to %s"
msgstr ""
-#: lxc/config.go:804
+#: lxc/config.go:831
#, c-format
msgid "Device %s removed from %s"
msgstr ""
@@ -303,11 +303,11 @@ msgstr ""
msgid "EXPIRY DATE"
msgstr ""
-#: lxc/main.go:55
+#: lxc/main.go:31
msgid "Enables debug mode."
msgstr "Active le mode de déboguage."
-#: lxc/main.go:54
+#: lxc/main.go:30
msgid "Enables verbose mode."
msgstr "Active le mode verbeux."
@@ -336,16 +336,16 @@ msgid ""
"AND stdout are terminals (stderr is ignored)."
msgstr "Exécute la commande spécifiée dans un conteneur.\n"
-#: lxc/image.go:339
+#: lxc/image.go:342
#, c-format
msgid "Expires: %s"
msgstr ""
-#: lxc/image.go:341
+#: lxc/image.go:344
msgid "Expires: never"
msgstr ""
-#: lxc/config.go:269 lxc/image.go:605 lxc/image.go:634
+#: lxc/config.go:269 lxc/image.go:619 lxc/image.go:661
msgid "FINGERPRINT"
msgstr ""
@@ -353,7 +353,7 @@ msgstr ""
msgid "Fast mode (same as --columns=nsacPt"
msgstr ""
-#: lxc/image.go:328
+#: lxc/image.go:331
#, fuzzy, c-format
msgid "Fingerprint: %s"
msgstr "Empreinte du certificat: % x\n"
@@ -374,15 +374,15 @@ msgstr "Force l'arrêt du conteneur."
msgid "Force the removal of stopped containers."
msgstr ""
-#: lxc/main.go:56
+#: lxc/main.go:32
msgid "Force using the local unix socket."
msgstr ""
-#: lxc/list.go:101
+#: lxc/image.go:160 lxc/list.go:101
msgid "Format"
msgstr ""
-#: lxc/main.go:138
+#: lxc/main.go:114
#, fuzzy
msgid "Generating a client certificate. This may take a minute..."
msgstr "Géneration d'un certificat client. Ceci peut prendre une minute...\n"
@@ -399,12 +399,12 @@ msgstr ""
msgid "ISSUE DATE"
msgstr ""
-#: lxc/main.go:146
+#: lxc/main.go:122
msgid ""
"If this is your first time using LXD, you should also run: sudo lxd init"
msgstr ""
-#: lxc/main.go:57
+#: lxc/main.go:33
msgid "Ignore aliases when determining what command to run."
msgstr ""
@@ -413,11 +413,11 @@ msgstr ""
msgid "Ignore the container state (only for start)."
msgstr "Force l'arrêt du conteneur."
-#: lxc/image.go:273
+#: lxc/image.go:276
msgid "Image copied successfully!"
msgstr ""
-#: lxc/image.go:419
+#: lxc/image.go:422
#, fuzzy, c-format
msgid "Image imported with fingerprint: %s"
msgstr "Empreinte du certificat: % x\n"
@@ -462,12 +462,12 @@ msgstr "Destination invalide %s"
msgid "Ips:"
msgstr ""
-#: lxc/image.go:156
+#: lxc/image.go:158
msgid "Keep the image up to date after initial copy"
msgstr ""
-#: lxc/main.go:35
-msgid "LXD socket not found; is LXD running?"
+#: client.go:556
+msgid "LXD socket not found; is LXD installed and running?"
msgstr ""
#: lxc/launch.go:22
@@ -537,7 +537,7 @@ msgstr ""
msgid "Log:"
msgstr ""
-#: lxc/image.go:154
+#: lxc/image.go:156
msgid "Make image public"
msgstr ""
@@ -563,16 +563,21 @@ msgid ""
" cat profile.yml | lxc profile edit <profile> # read from "
"profile.yml\n"
"\n"
-"lxc profile apply <container> <profiles>\n"
-" Apply a comma-separated list of profiles to a container, in order.\n"
+"lxc profile assign <container> <profiles>\n"
+" Assign a comma-separated list of profiles to a container, in order.\n"
" All profiles passed in this call (and only those) will be applied\n"
-" to the specified container.\n"
-" Example: lxc profile apply foo default,bar # Apply default and bar\n"
-" lxc profile apply foo default # Only default is active\n"
-" lxc profile apply '' # no profiles are applied anymore\n"
-" lxc profile apply bar,default # Apply default second now\n"
-"lxc profile apply-add <container> <profile>\n"
-"lxc profile apply-remove <container> <profile>\n"
+" to the specified container, i.e. it sets the list of profiles exactly "
+"to\n"
+" those specified in this command. To add/remove a particular profile from "
+"a\n"
+" container, use {add|remove} below.\n"
+" Example: lxc profile assign foo default,bar # Apply default and bar\n"
+" lxc profile assign foo default # Only default is active\n"
+" lxc profile assign '' # no profiles are applied anymore\n"
+" lxc profile assign bar,default # Apply default second now\n"
+"lxc profile add <container> <profile> # add a profile to a container\n"
+"lxc profile remove <container> <profile> # remove the profile from a "
+"container\n"
"\n"
"Devices:\n"
"lxc profile device list <profile> List "
@@ -686,7 +691,7 @@ msgid ""
"Print the default remote."
msgstr ""
-#: lxc/image.go:93
+#: lxc/image.go:95
msgid ""
"Manipulate container images.\n"
"\n"
@@ -726,7 +731,7 @@ msgid ""
"lxc image info [remote:]<image>\n"
" Print everything LXD knows about a given image.\n"
"\n"
-"lxc image list [remote:] [filter]\n"
+"lxc image list [remote:] [filter] [--format table|json]\n"
" List images in the LXD image store. Filters may be of the\n"
" <key>=<value> form for property based filtering, or part of the image\n"
" hash or part of the image alias name.\n"
@@ -811,7 +816,7 @@ msgstr ""
msgid "Name: %s"
msgstr ""
-#: lxc/image.go:157 lxc/publish.go:33
+#: lxc/image.go:159 lxc/publish.go:33
msgid "New alias to define at target"
msgstr ""
@@ -828,16 +833,16 @@ msgstr "Aucune empreinte n'a été spécifié."
msgid "Only https URLs are supported for simplestreams"
msgstr ""
-#: lxc/image.go:411
+#: lxc/image.go:414
msgid "Only https:// is supported for remote image import."
msgstr ""
-#: lxc/help.go:63 lxc/main.go:122
+#: lxc/help.go:63 lxc/main.go:98
#, fuzzy
msgid "Options:"
msgstr "Opération %s"
-#: lxc/image.go:506
+#: lxc/image.go:518
#, c-format
msgid "Output is in %s"
msgstr ""
@@ -862,7 +867,7 @@ msgstr ""
msgid "PROTOCOL"
msgstr ""
-#: lxc/image.go:606 lxc/remote.go:366
+#: lxc/image.go:620 lxc/remote.go:366
msgid "PUBLIC"
msgstr ""
@@ -884,7 +889,7 @@ msgstr "Dossier de configuration alternatif."
msgid "Path to an alternate server directory."
msgstr "Dossier de configuration alternatif."
-#: lxc/main.go:39
+#: client.go:560
msgid "Permisson denied, are you in the lxd group?"
msgstr ""
@@ -901,11 +906,11 @@ msgid ""
"lxd help [--all]"
msgstr "Explique comment utiliser LXD.\n"
-#: lxc/profile.go:216
+#: lxc/profile.go:218
msgid "Press enter to open the editor again"
msgstr ""
-#: lxc/config.go:501 lxc/config.go:566 lxc/image.go:688
+#: lxc/config.go:528 lxc/config.go:593 lxc/image.go:715
msgid "Press enter to start the editor again"
msgstr ""
@@ -934,22 +939,22 @@ msgstr "Montre le numéro de version de LXD.\n"
msgid "Processes: %d"
msgstr "Mauvaise URL pour le conteneur %s"
-#: lxc/profile.go:272
+#: lxc/profile.go:274
#, fuzzy, c-format
msgid "Profile %s added to %s"
msgstr "Mauvaise URL pour le conteneur %s"
-#: lxc/profile.go:167
+#: lxc/profile.go:169
#, c-format
msgid "Profile %s created"
msgstr ""
-#: lxc/profile.go:237
+#: lxc/profile.go:239
#, c-format
msgid "Profile %s deleted"
msgstr ""
-#: lxc/profile.go:303
+#: lxc/profile.go:305
#, c-format
msgid "Profile %s removed from %s"
msgstr ""
@@ -958,7 +963,7 @@ msgstr ""
msgid "Profile to apply to the new container"
msgstr ""
-#: lxc/profile.go:253
+#: lxc/profile.go:255
#, c-format
msgid "Profiles %s applied to %s"
msgstr ""
@@ -968,7 +973,7 @@ msgstr ""
msgid "Profiles: %s"
msgstr "Mauvaise URL pour le conteneur %s"
-#: lxc/image.go:343
+#: lxc/image.go:346
msgid "Properties:"
msgstr ""
@@ -976,7 +981,7 @@ msgstr ""
msgid "Public image server"
msgstr ""
-#: lxc/image.go:331
+#: lxc/image.go:334
#, c-format
msgid "Public: %s"
msgstr ""
@@ -1011,7 +1016,7 @@ msgstr ""
msgid "Retrieving image: %s"
msgstr ""
-#: lxc/image.go:609
+#: lxc/image.go:623
msgid "SIZE"
msgstr ""
@@ -1073,7 +1078,7 @@ msgstr "Affiche toutes les comandes (pas seulement les intéresantes)"
msgid "Show the container's last 100 log lines?"
msgstr ""
-#: lxc/image.go:329
+#: lxc/image.go:332
#, c-format
msgid "Size: %.2fMB"
msgstr ""
@@ -1082,7 +1087,7 @@ msgstr ""
msgid "Snapshots:"
msgstr ""
-#: lxc/image.go:353
+#: lxc/image.go:356
msgid "Source:"
msgstr ""
@@ -1131,8 +1136,8 @@ msgid ""
"restarted."
msgstr ""
-#: lxc/config.go:645 lxc/config.go:657 lxc/config.go:690 lxc/config.go:708
-#: lxc/config.go:746 lxc/config.go:764
+#: lxc/config.go:672 lxc/config.go:684 lxc/config.go:717 lxc/config.go:735
+#: lxc/config.go:773 lxc/config.go:791
#, fuzzy
msgid "The device doesn't exist"
msgstr "le serveur distant %s n'existe pas"
@@ -1150,15 +1155,15 @@ msgstr ""
msgid "Time to wait for the container before killing it."
msgstr "Temps d'attente avant de tuer le conteneur."
-#: lxc/image.go:332
+#: lxc/image.go:335
msgid "Timestamps:"
msgstr ""
-#: lxc/main.go:147
+#: lxc/main.go:123
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
-#: lxc/image.go:402
+#: lxc/image.go:405
#, c-format
msgid "Transferring image: %d%%"
msgstr ""
@@ -1176,7 +1181,7 @@ msgstr ""
msgid "Type: persistent"
msgstr ""
-#: lxc/image.go:610
+#: lxc/image.go:624
msgid "UPLOAD DATE"
msgstr ""
@@ -1188,12 +1193,12 @@ msgstr ""
msgid "Unable to read remote TLS certificate"
msgstr ""
-#: lxc/image.go:337
+#: lxc/image.go:340
#, c-format
msgid "Uploaded: %s"
msgstr ""
-#: lxc/main.go:122
+#: lxc/main.go:98
#, fuzzy, c-format
msgid "Usage: %s"
msgstr ""
@@ -1236,7 +1241,7 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lxc/main.go:66
+#: lxc/main.go:42
msgid "`lxc config profile` is deprecated, please use `lxc profile`"
msgstr ""
@@ -1249,7 +1254,7 @@ msgstr "nombre de propriété invalide pour la ressource"
msgid "bad result type from action"
msgstr "mauvais type de réponse pour l'action!"
-#: lxc/copy.go:78
+#: lxc/copy.go:99
msgid "can't copy to the same container name"
msgstr ""
@@ -1266,20 +1271,20 @@ msgstr ""
msgid "didn't get any affected image, container or snapshot from server"
msgstr "N'a pas pû obtenir de resource du serveur"
-#: lxc/image.go:323
+#: lxc/image.go:326
msgid "disabled"
msgstr ""
-#: lxc/image.go:325
+#: lxc/image.go:328
msgid "enabled"
msgstr ""
-#: lxc/main.go:25 lxc/main.go:159
+#: client.go:525 lxc/main.go:135
#, fuzzy, c-format
msgid "error: %v"
msgstr "erreur: %v\n"
-#: lxc/help.go:40 lxc/main.go:117
+#: lxc/help.go:40 lxc/main.go:93
#, fuzzy, c-format
msgid "error: unknown command: %s"
msgstr "erreur: comande inconnue: %s\n"
@@ -1288,11 +1293,11 @@ msgstr "erreur: comande inconnue: %s\n"
msgid "got bad version"
msgstr "reçu une version invalide"
-#: lxc/image.go:318 lxc/image.go:586
+#: lxc/image.go:321 lxc/image.go:600
msgid "no"
msgstr ""
-#: lxc/copy.go:101
+#: lxc/copy.go:122
msgid "not all the profiles from the source exist on the target"
msgstr ""
@@ -1301,7 +1306,7 @@ msgstr ""
msgid "ok (y/n)?"
msgstr "ok (y/n)?"
-#: lxc/main.go:266 lxc/main.go:270
+#: lxc/main.go:242 lxc/main.go:246
#, c-format
msgid "processing aliases failed %s\n"
msgstr ""
@@ -1343,11 +1348,11 @@ msgstr ""
msgid "unreachable return reached"
msgstr "Un retour inacessible à été atteint"
-#: lxc/main.go:199
+#: lxc/main.go:175
msgid "wrong number of subcommand arguments"
msgstr "nombre d'argument incorrect pour la sous-comande"
-#: lxc/delete.go:45 lxc/image.go:320 lxc/image.go:590
+#: lxc/delete.go:45 lxc/image.go:323 lxc/image.go:604
msgid "yes"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index c7da0b7..94562f4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LXD\n"
"Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2016-04-25 14:47-0500\n"
+"POT-Creation-Date: 2016-06-02 10:13-0700\n"
"PO-Revision-Date: 2016-04-26 14:31+0900\n"
"Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
"Language-Team: Japanese <lxd-ja-language-team at googlegroups.com>\n"
@@ -49,7 +49,7 @@ msgid ""
"### Note that the name is shown but cannot be changed"
msgstr ""
-#: lxc/image.go:83
+#: lxc/image.go:85
msgid ""
"### This is a yaml representation of the image properties.\n"
"### Any line starting with a '# will be ignored.\n"
@@ -80,7 +80,7 @@ msgid ""
"### Note that the name is shown but cannot be changed"
msgstr ""
-#: lxc/image.go:583
+#: lxc/image.go:597
#, c-format
msgid "%s (%d more)"
msgstr ""
@@ -89,15 +89,15 @@ msgstr ""
msgid "'/' not allowed in snapshot name"
msgstr "'/' はスナップショットの名前には使用できません。"
-#: lxc/profile.go:251
+#: lxc/profile.go:253
msgid "(none)"
msgstr ""
-#: lxc/image.go:604 lxc/image.go:633
+#: lxc/image.go:618 lxc/image.go:660
msgid "ALIAS"
msgstr ""
-#: lxc/image.go:608
+#: lxc/image.go:622
msgid "ARCH"
msgstr ""
@@ -114,7 +114,7 @@ msgstr "証明書のフィンガープリントの確認なしで証明書を受
msgid "Admin password for %s: "
msgstr "%s の管理者パスワード: "
-#: lxc/image.go:347
+#: lxc/image.go:350
msgid "Aliases:"
msgstr "エイリアス:"
@@ -122,12 +122,12 @@ msgstr "エイリアス:"
msgid "An environment variable of the form HOME=/home/foo"
msgstr "環境変数を HOME=/home/foo の形式で指定します"
-#: lxc/image.go:330 lxc/info.go:90
+#: lxc/image.go:333 lxc/info.go:90
#, c-format
msgid "Architecture: %s"
msgstr "アーキテクチャ: %s"
-#: lxc/image.go:351
+#: lxc/image.go:354
#, c-format
msgid "Auto update: %s"
msgstr "自動更新: %s"
@@ -162,7 +162,7 @@ msgstr "標準入力から読み込めません: %s"
msgid "Can't unset key '%s', it's not currently set."
msgstr "キー '%s' が指定されていないので削除できません。"
-#: lxc/profile.go:417
+#: lxc/profile.go:419
msgid "Cannot provide container name to list"
msgstr "コンテナ名を取得できません"
@@ -194,12 +194,12 @@ msgstr "カラムレイアウト"
msgid "Config key/value to apply to the new container"
msgstr "新しいコンテナに適用するキー/値の設定"
-#: lxc/config.go:500 lxc/config.go:565 lxc/image.go:687 lxc/profile.go:215
+#: lxc/config.go:527 lxc/config.go:592 lxc/image.go:714 lxc/profile.go:217
#, c-format
msgid "Config parsing error: %s"
msgstr "設定の構文エラー: %s"
-#: lxc/main.go:37
+#: client.go:558
msgid "Connection refused; is LXD running?"
msgstr "接続が拒否されました。LXDが実行されていますか?"
@@ -217,7 +217,7 @@ msgstr "コンテナ名: %s"
msgid "Container published with fingerprint: %s"
msgstr "コンテナは以下のフィンガープリントで publish されます: %s"
-#: lxc/image.go:155
+#: lxc/image.go:157
msgid "Copy aliases from source"
msgstr "ソースからエイリアスをコピーしました"
@@ -233,7 +233,7 @@ msgstr ""
"lxc copy [remote:]<source container> [remote:]<destination container> [--"
"ephemeral|e]"
-#: lxc/image.go:268
+#: lxc/image.go:271
#, c-format
msgid "Copying the image: %s"
msgstr "イメージのコピー中: %s"
@@ -274,7 +274,7 @@ msgstr ""
"例:\n"
"lxc snapshot u1 snap0"
-#: lxc/image.go:335 lxc/info.go:92
+#: lxc/image.go:338 lxc/info.go:92
#, c-format
msgid "Created: %s"
msgstr "作成日時: %s"
@@ -288,7 +288,7 @@ msgstr "%s を作成中"
msgid "Creating the container"
msgstr "コンテナを作成中"
-#: lxc/image.go:607 lxc/image.go:635
+#: lxc/image.go:621 lxc/image.go:662
msgid "DESCRIPTION"
msgstr ""
@@ -310,12 +310,12 @@ msgstr ""
"付属するデータ (設定、スナップショット、...) と一緒にコンテナもしくはコンテ\n"
"ナのスナップショットを消去します。"
-#: lxc/config.go:617
+#: lxc/config.go:644
#, c-format
msgid "Device %s added to %s"
msgstr "デバイス %s が %s に追加されました"
-#: lxc/config.go:804
+#: lxc/config.go:831
#, c-format
msgid "Device %s removed from %s"
msgstr "デバイス %s が %s から削除されました"
@@ -328,11 +328,11 @@ msgstr ""
msgid "EXPIRY DATE"
msgstr ""
-#: lxc/main.go:55
+#: lxc/main.go:31
msgid "Enables debug mode."
msgstr "デバッグモードを有効にします。"
-#: lxc/main.go:54
+#: lxc/main.go:30
msgid "Enables verbose mode."
msgstr "詳細モードを有効にします。"
@@ -367,16 +367,16 @@ msgstr ""
"デフォルトのモードは non-interactive です。もし標準入出力が両方ともターミナ\n"
"ルの場合は interactive モードが選択されます (標準エラー出力は無視されます)。"
-#: lxc/image.go:339
+#: lxc/image.go:342
#, c-format
msgid "Expires: %s"
msgstr "失効日時: %s"
-#: lxc/image.go:341
+#: lxc/image.go:344
msgid "Expires: never"
msgstr "失効日時: 失効しない"
-#: lxc/config.go:269 lxc/image.go:605 lxc/image.go:634
+#: lxc/config.go:269 lxc/image.go:619 lxc/image.go:661
msgid "FINGERPRINT"
msgstr ""
@@ -384,7 +384,7 @@ msgstr ""
msgid "Fast mode (same as --columns=nsacPt"
msgstr "Fast モード (--columns=nsacPt と同じ)"
-#: lxc/image.go:328
+#: lxc/image.go:331
#, c-format
msgid "Fingerprint: %s"
msgstr "証明書のフィンガープリント: %s"
@@ -407,15 +407,15 @@ msgstr "コンテナを強制シャットダウンします。"
msgid "Force the removal of stopped containers."
msgstr "停止したコンテナを強制的に削除します。"
-#: lxc/main.go:56
+#: lxc/main.go:32
msgid "Force using the local unix socket."
msgstr "強制的にローカルのUNIXソケットを使います。"
-#: lxc/list.go:101
+#: lxc/image.go:160 lxc/list.go:101
msgid "Format"
msgstr ""
-#: lxc/main.go:138
+#: lxc/main.go:114
msgid "Generating a client certificate. This may take a minute..."
msgstr "クライアント証明書を生成します。1分ぐらいかかります..."
@@ -431,12 +431,12 @@ msgstr ""
msgid "ISSUE DATE"
msgstr ""
-#: lxc/main.go:146
+#: lxc/main.go:122
msgid ""
"If this is your first time using LXD, you should also run: sudo lxd init"
msgstr "初めて LXD を使う場合、sudo lxd init と実行する必要があります"
-#: lxc/main.go:57
+#: lxc/main.go:33
msgid "Ignore aliases when determining what command to run."
msgstr "どのコマンドを実行するか決める際にエイリアスを無視します。"
@@ -444,11 +444,11 @@ msgstr "どのコマンドを実行するか決める際にエイリアスを無
msgid "Ignore the container state (only for start)."
msgstr "コンテナの状態を無視します (startのみ)。"
-#: lxc/image.go:273
+#: lxc/image.go:276
msgid "Image copied successfully!"
msgstr "イメージのコピーが成功しました!"
-#: lxc/image.go:419
+#: lxc/image.go:422
#, c-format
msgid "Image imported with fingerprint: %s"
msgstr "イメージは以下のフィンガープリントでインポートされました: %s"
@@ -504,12 +504,12 @@ msgstr "不正な送り先 %s"
msgid "Ips:"
msgstr "IPアドレス:"
-#: lxc/image.go:156
+#: lxc/image.go:158
msgid "Keep the image up to date after initial copy"
msgstr "最初にコピーした後も常にイメージを最新の状態に保つ"
-#: lxc/main.go:35
-msgid "LXD socket not found; is LXD running?"
+#: client.go:556
+msgid "LXD socket not found; is LXD installed and running?"
msgstr "LXD のソケットが見つかりません。LXD が実行されていますか?"
#: lxc/launch.go:22
@@ -529,7 +529,8 @@ msgid ""
msgstr ""
"指定したイメージからコンテナを起動します。\n"
"\n"
-"lxc launch [remote:]<image> [remote:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...]\n"
+"lxc launch [remote:]<image> [remote:][<name>] [--ephemeral|-e] [--profile|-p "
+"<profile>...] [--config|-c <key=value>...]\n"
"\n"
"指定したイメージと名前を使ってコンテナを起動します。\n"
"\n"
@@ -597,17 +598,21 @@ msgstr ""
"lxc list [resource] [filters] [--format table|json] [-c columns] [--fast]\n"
"\n"
"フィルタの指定:\n"
-"* 単一の \"web\" のようなキーワードを指定すると、名前が \"web\" ではじまるコンテ\n"
+"* 単一の \"web\" のようなキーワードを指定すると、名前が \"web\" ではじまるコ"
+"ンテ\n"
" ナが一覧表示されます。\n"
"* コンテナ名の正規表現 (例: .*web.*01$)\n"
-"* 設定項目のキーと値。キーの名前空間は一意に識別できる場合は短縮することがで\n"
+"* 設定項目のキーと値。キーの名前空間は一意に識別できる場合は短縮することが"
+"で\n"
" きます:\n"
-" * \"user.blah=abc\" は \"blah\" という user プロパティが \"abc\" に設定されている\n"
+" * \"user.blah=abc\" は \"blah\" という user プロパティが \"abc\" に設定され"
+"ている\n"
" コンテナをすべて一覧表示します。\n"
" * \"u.blah=abc\" は上記と同じ意味になります。\n"
" * \"security.privileged=1\" は特権コンテナをすべて一覧表示します。\n"
" * \"s.privilaged=1\" は上記と同じ意味になります。\n"
-" * 設定項目もしくは値とマッチする正規表現 (例:volatile.eth0.hwaddr=00:16:3e:.*)\n"
+" * 設定項目もしくは値とマッチする正規表現 (例:volatile.eth0.hwaddr=00:16:3e:."
+"*)\n"
"\n"
"表のカラムの指定:\n"
"* 4 - IPv4 アドレス\n"
@@ -628,7 +633,7 @@ msgstr ""
msgid "Log:"
msgstr "ログ:"
-#: lxc/image.go:154
+#: lxc/image.go:156
msgid "Make image public"
msgstr "イメージを public にする"
@@ -637,6 +642,7 @@ msgid "Make the image public"
msgstr "イメージを public にする"
#: lxc/profile.go:48
+#, fuzzy
msgid ""
"Manage configuration profiles.\n"
"\n"
@@ -654,16 +660,21 @@ msgid ""
" cat profile.yml | lxc profile edit <profile> # read from "
"profile.yml\n"
"\n"
-"lxc profile apply <container> <profiles>\n"
-" Apply a comma-separated list of profiles to a container, in order.\n"
+"lxc profile assign <container> <profiles>\n"
+" Assign a comma-separated list of profiles to a container, in order.\n"
" All profiles passed in this call (and only those) will be applied\n"
-" to the specified container.\n"
-" Example: lxc profile apply foo default,bar # Apply default and bar\n"
-" lxc profile apply foo default # Only default is active\n"
-" lxc profile apply '' # no profiles are applied anymore\n"
-" lxc profile apply bar,default # Apply default second now\n"
-"lxc profile apply-add <container> <profile>\n"
-"lxc profile apply-remove <container> <profile>\n"
+" to the specified container, i.e. it sets the list of profiles exactly "
+"to\n"
+" those specified in this command. To add/remove a particular profile from "
+"a\n"
+" container, use {add|remove} below.\n"
+" Example: lxc profile assign foo default,bar # Apply default and bar\n"
+" lxc profile assign foo default # Only default is active\n"
+" lxc profile assign '' # no profiles are applied anymore\n"
+" lxc profile assign bar,default # Apply default second now\n"
+"lxc profile add <container> <profile> # add a profile to a container\n"
+"lxc profile remove <container> <profile> # remove the profile from a "
+"container\n"
"\n"
"Devices:\n"
"lxc profile device list <profile> List "
@@ -702,7 +713,8 @@ msgstr ""
"lxc profile edit <profile>\n"
" プロファイルを編集します。外部エディタもしくはSTDINから読み込みます。\n"
" 例: lxc profile edit <profile> # エディタの起動\n"
-" cat profile.yml | lxc profile edit <profile> # profile.yml から読み込み\n"
+" cat profile.yml | lxc profile edit <profile> # profile.yml から読み込"
+"み\n"
"\n"
"lxc profile apply <container> <profiles>\n"
" プロファイルのコンマ区切りのリストをコンテナに順番に適用します。\n"
@@ -727,7 +739,8 @@ msgstr ""
" デバイスプロパティを設定します\n"
"lxc profile device unset <[remote:]profile> <name> <key>\n"
" デバイスプロパティを削除します\n"
-"lxc profile device add <profile name> <device name> <device type> [key=value]...\n"
+"lxc profile device add <profile name> <device name> <device type> "
+"[key=value]...\n"
" ディスクやNICのようなプロファイルデバイスを指定したプロファイルを使って\n"
" コンテナに追加します。"
@@ -905,7 +918,8 @@ msgstr ""
"lxc remote get-default\n"
" デフォルトに設定されているリモートホストを表示します。"
-#: lxc/image.go:93
+#: lxc/image.go:95
+#, fuzzy
msgid ""
"Manipulate container images.\n"
"\n"
@@ -945,7 +959,7 @@ msgid ""
"lxc image info [remote:]<image>\n"
" Print everything LXD knows about a given image.\n"
"\n"
-"lxc image list [remote:] [filter]\n"
+"lxc image list [remote:] [filter] [--format table|json]\n"
" List images in the LXD image store. Filters may be of the\n"
" <key>=<value> form for property based filtering, or part of the image\n"
" hash or part of the image alias name.\n"
@@ -983,11 +997,14 @@ msgstr ""
"る場合は) エイリアスで参照できます。\n"
"\n"
"\n"
-"lxc image import <tarball> [rootfs tarball|URL] [remote:] [--public] [--created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] [--alias=ALIAS].. [prop=value]\n"
+"lxc image import <tarball> [rootfs tarball|URL] [remote:] [--public] [--"
+"created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] [--"
+"alias=ALIAS].. [prop=value]\n"
" イメージの tarball (複数も可能) を LXD のイメージストアにインポートしま\n"
" す。\n"
"\n"
-"lxc image copy [remote:]<image> <remote>: [--alias=ALIAS].. [--copy-aliases] [--public] [--auto-update]\n"
+"lxc image copy [remote:]<image> <remote>: [--alias=ALIAS].. [--copy-aliases] "
+"[--public] [--auto-update]\n"
" ネットワーク経由である LXD デーモンから他の LXD デーモンへイメージを\n"
" コピーします。\n"
"\n"
@@ -1024,7 +1041,8 @@ msgstr ""
" エイリアスを削除します。\n"
"\n"
"lxc image alias list [remote:] [filter]\n"
-" エイリアスを一覧表示します。イメージハッシュの一部やイメージのエイリアス\n"
+" エイリアスを一覧表示します。イメージハッシュの一部やイメージのエイリア"
+"ス\n"
" 名の一部をフィルタとして指定できます。\n"
#: lxc/info.go:147
@@ -1108,7 +1126,7 @@ msgstr ""
msgid "Name: %s"
msgstr "コンテナ名: %s"
-#: lxc/image.go:157 lxc/publish.go:33
+#: lxc/image.go:159 lxc/publish.go:33
msgid "New alias to define at target"
msgstr "新しいエイリアスを定義する"
@@ -1124,15 +1142,15 @@ msgstr "フィンガープリントが指定されていません。"
msgid "Only https URLs are supported for simplestreams"
msgstr "simplestreams は https の URL のみサポートします"
-#: lxc/image.go:411
+#: lxc/image.go:414
msgid "Only https:// is supported for remote image import."
msgstr "リモートイメージのインポートは https:// のみをサポートします。"
-#: lxc/help.go:63 lxc/main.go:122
+#: lxc/help.go:63 lxc/main.go:98
msgid "Options:"
msgstr "オプション:"
-#: lxc/image.go:506
+#: lxc/image.go:518
#, c-format
msgid "Output is in %s"
msgstr "%s に出力されます"
@@ -1157,7 +1175,7 @@ msgstr ""
msgid "PROTOCOL"
msgstr ""
-#: lxc/image.go:606 lxc/remote.go:366
+#: lxc/image.go:620 lxc/remote.go:366
msgid "PUBLIC"
msgstr ""
@@ -1177,7 +1195,7 @@ msgstr "別のクライアント用設定ディレクトリ"
msgid "Path to an alternate server directory."
msgstr "別のサーバ用設定ディレクトリ"
-#: lxc/main.go:39
+#: client.go:560
msgid "Permisson denied, are you in the lxd group?"
msgstr "アクセスが拒否されました。lxd グループに所属していますか?"
@@ -1196,11 +1214,11 @@ msgstr ""
"\n"
"lxd help [--all]"
-#: lxc/profile.go:216
+#: lxc/profile.go:218
msgid "Press enter to open the editor again"
msgstr "再度エディタを開くためには Enter キーを押します"
-#: lxc/config.go:501 lxc/config.go:566 lxc/image.go:688
+#: lxc/config.go:528 lxc/config.go:593 lxc/image.go:715
msgid "Press enter to start the editor again"
msgstr "再度エディタを起動するには Enter キーを押します"
@@ -1231,22 +1249,22 @@ msgstr ""
msgid "Processes: %d"
msgstr "プロセス数: %d"
-#: lxc/profile.go:272
+#: lxc/profile.go:274
#, c-format
msgid "Profile %s added to %s"
msgstr "プロファイル %s が %s に追加されました"
-#: lxc/profile.go:167
+#: lxc/profile.go:169
#, c-format
msgid "Profile %s created"
msgstr "プロファイル %s を作成しました"
-#: lxc/profile.go:237
+#: lxc/profile.go:239
#, c-format
msgid "Profile %s deleted"
msgstr "プロファイル %s を削除しました"
-#: lxc/profile.go:303
+#: lxc/profile.go:305
#, c-format
msgid "Profile %s removed from %s"
msgstr "プロファイル %s が %s から削除されました"
@@ -1255,7 +1273,7 @@ msgstr "プロファイル %s が %s から削除されました"
msgid "Profile to apply to the new container"
msgstr "新しいコンテナに適用するプロファイル"
-#: lxc/profile.go:253
+#: lxc/profile.go:255
#, c-format
msgid "Profiles %s applied to %s"
msgstr "プロファイル %s が %s に追加されました"
@@ -1265,7 +1283,7 @@ msgstr "プロファイル %s が %s に追加されました"
msgid "Profiles: %s"
msgstr "プロファイル: %s"
-#: lxc/image.go:343
+#: lxc/image.go:346
msgid "Properties:"
msgstr "プロパティ:"
@@ -1273,7 +1291,7 @@ msgstr "プロパティ:"
msgid "Public image server"
msgstr "Public なイメージサーバとして設定します"
-#: lxc/image.go:331
+#: lxc/image.go:334
#, c-format
msgid "Public: %s"
msgstr ""
@@ -1312,7 +1330,7 @@ msgstr "リソース:"
msgid "Retrieving image: %s"
msgstr "イメージの取得中: %s"
-#: lxc/image.go:609
+#: lxc/image.go:623
msgid "SIZE"
msgstr ""
@@ -1384,7 +1402,7 @@ msgstr "全てコマンドを表示します (主なコマンドだけではな
msgid "Show the container's last 100 log lines?"
msgstr "コンテナログの最後の 100 行を表示しますか?"
-#: lxc/image.go:329
+#: lxc/image.go:332
#, c-format
msgid "Size: %.2fMB"
msgstr "サイズ: %.2fMB"
@@ -1393,7 +1411,7 @@ msgstr "サイズ: %.2fMB"
msgid "Snapshots:"
msgstr "スナップショット:"
-#: lxc/image.go:353
+#: lxc/image.go:356
msgid "Source:"
msgstr "取得元:"
@@ -1443,15 +1461,16 @@ msgstr ""
"コンテナは現在実行中です。停止して、再起動するために --force を使用してくだ\n"
"さい。"
-#: lxc/config.go:645 lxc/config.go:657 lxc/config.go:690 lxc/config.go:708
-#: lxc/config.go:746 lxc/config.go:764
+#: lxc/config.go:672 lxc/config.go:684 lxc/config.go:717 lxc/config.go:735
+#: lxc/config.go:773 lxc/config.go:791
msgid "The device doesn't exist"
msgstr "デバイスが存在しません"
#: lxc/init.go:277
#, c-format
msgid "The local image '%s' couldn't be found, trying '%s:' instead."
-msgstr "ローカルイメージ '%s' が見つかりません。代わりに '%s:' を試してみてください。"
+msgstr ""
+"ローカルイメージ '%s' が見つかりません。代わりに '%s:' を試してみてください。"
#: lxc/publish.go:62
msgid "There is no \"image name\". Did you want an alias?"
@@ -1464,17 +1483,18 @@ msgstr ""
msgid "Time to wait for the container before killing it."
msgstr "コンテナを強制停止するまでの時間"
-#: lxc/image.go:332
+#: lxc/image.go:335
msgid "Timestamps:"
msgstr "タイムスタンプ:"
-#: lxc/main.go:147
+#: lxc/main.go:123
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
-"初めてコンテナを起動するには、\"lxc launch ubuntu:16.04\" と実行してみてくだ\n"
+"初めてコンテナを起動するには、\"lxc launch ubuntu:16.04\" と実行してみてく"
+"だ\n"
"さい。"
-#: lxc/image.go:402
+#: lxc/image.go:405
#, c-format
msgid "Transferring image: %d%%"
msgstr "イメージを転送中: %d%%"
@@ -1492,7 +1512,7 @@ msgstr "タイプ: ephemeral"
msgid "Type: persistent"
msgstr "タイプ: persistent"
-#: lxc/image.go:610
+#: lxc/image.go:624
msgid "UPLOAD DATE"
msgstr ""
@@ -1504,12 +1524,12 @@ msgstr ""
msgid "Unable to read remote TLS certificate"
msgstr "リモートの TLS 証明書を読めません"
-#: lxc/image.go:337
+#: lxc/image.go:340
#, c-format
msgid "Uploaded: %s"
msgstr "アップロード日時: %s"
-#: lxc/main.go:122
+#: lxc/main.go:98
#, c-format
msgid "Usage: %s"
msgstr "使い方: %s"
@@ -1541,7 +1561,7 @@ msgstr "拡張した設定を表示するかどうか"
msgid "YES"
msgstr ""
-#: lxc/main.go:66
+#: lxc/main.go:42
msgid "`lxc config profile` is deprecated, please use `lxc profile`"
msgstr "`lxc config profile` は廃止されました。`lxc profile` を使ってください"
@@ -1554,7 +1574,7 @@ msgstr ""
msgid "bad result type from action"
msgstr "アクションからの結果タイプが不正です"
-#: lxc/copy.go:78
+#: lxc/copy.go:99
msgid "can't copy to the same container name"
msgstr "同じコンテナ名へはコピーできません"
@@ -1572,20 +1592,20 @@ msgstr ""
"サーバから変更されたイメージ、コンテナ、スナップショットを取得できませんで\n"
"した"
-#: lxc/image.go:323
+#: lxc/image.go:326
msgid "disabled"
msgstr "無効"
-#: lxc/image.go:325
+#: lxc/image.go:328
msgid "enabled"
msgstr "有効"
-#: lxc/main.go:25 lxc/main.go:159
+#: client.go:525 lxc/main.go:135
#, c-format
msgid "error: %v"
msgstr "エラー: %v"
-#: lxc/help.go:40 lxc/main.go:117
+#: lxc/help.go:40 lxc/main.go:93
#, c-format
msgid "error: unknown command: %s"
msgstr "エラー: 未知のコマンド: %s"
@@ -1594,11 +1614,11 @@ msgstr "エラー: 未知のコマンド: %s"
msgid "got bad version"
msgstr "不正なバージョンを得ました"
-#: lxc/image.go:318 lxc/image.go:586
+#: lxc/image.go:321 lxc/image.go:600
msgid "no"
msgstr ""
-#: lxc/copy.go:101
+#: lxc/copy.go:122
msgid "not all the profiles from the source exist on the target"
msgstr "コピー元の全てのプロファイルがターゲットに存在しません"
@@ -1606,7 +1626,7 @@ msgstr "コピー元の全てのプロファイルがターゲットに存在し
msgid "ok (y/n)?"
msgstr "ok (y/n)?"
-#: lxc/main.go:266 lxc/main.go:270
+#: lxc/main.go:242 lxc/main.go:246
#, c-format
msgid "processing aliases failed %s\n"
msgstr "エイリアスの処理が失敗しました %s\n"
@@ -1648,11 +1668,11 @@ msgstr "%s に取得しました"
msgid "unreachable return reached"
msgstr "到達しないはずのreturnに到達しました"
-#: lxc/main.go:199
+#: lxc/main.go:175
msgid "wrong number of subcommand arguments"
msgstr "サブコマンドの引数の数が正しくありません"
-#: lxc/delete.go:45 lxc/image.go:320 lxc/image.go:590
+#: lxc/delete.go:45 lxc/image.go:323 lxc/image.go:604
msgid "yes"
msgstr ""
diff --git a/po/lxd.pot b/po/lxd.pot
index edf9f99..112b83c 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: 2016-05-23 07:23-0600\n"
+ "POT-Creation-Date: 2016-06-02 10:13-0700\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"
@@ -192,7 +192,7 @@ msgstr ""
msgid "Config parsing error: %s"
msgstr ""
-#: lxc/main.go:37
+#: client.go:558
msgid "Connection refused; is LXD running?"
msgstr ""
@@ -289,11 +289,11 @@ msgstr ""
msgid "EXPIRY DATE"
msgstr ""
-#: lxc/main.go:55
+#: lxc/main.go:31
msgid "Enables debug mode."
msgstr ""
-#: lxc/main.go:54
+#: lxc/main.go:30
msgid "Enables verbose mode."
msgstr ""
@@ -353,7 +353,7 @@ msgstr ""
msgid "Force the removal of stopped containers."
msgstr ""
-#: lxc/main.go:56
+#: lxc/main.go:32
msgid "Force using the local unix socket."
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
msgid "Format"
msgstr ""
-#: lxc/main.go:138
+#: lxc/main.go:114
msgid "Generating a client certificate. This may take a minute..."
msgstr ""
@@ -377,11 +377,11 @@ msgstr ""
msgid "ISSUE DATE"
msgstr ""
-#: lxc/main.go:146
+#: lxc/main.go:122
msgid "If this is your first time using LXD, you should also run: sudo lxd init"
msgstr ""
-#: lxc/main.go:57
+#: lxc/main.go:33
msgid "Ignore aliases when determining what command to run."
msgstr ""
@@ -439,8 +439,8 @@ msgstr ""
msgid "Keep the image up to date after initial copy"
msgstr ""
-#: lxc/main.go:35
-msgid "LXD socket not found; is LXD running?"
+#: client.go:556
+msgid "LXD socket not found; is LXD installed and running?"
msgstr ""
#: lxc/launch.go:22
@@ -747,7 +747,7 @@ msgstr ""
msgid "Only https:// is supported for remote image import."
msgstr ""
-#: lxc/help.go:63 lxc/main.go:122
+#: lxc/help.go:63 lxc/main.go:98
msgid "Options:"
msgstr ""
@@ -796,7 +796,7 @@ msgstr ""
msgid "Path to an alternate server directory."
msgstr ""
-#: lxc/main.go:39
+#: client.go:560
msgid "Permisson denied, are you in the lxd group?"
msgstr ""
@@ -1054,7 +1054,7 @@ msgstr ""
msgid "Timestamps:"
msgstr ""
-#: lxc/main.go:147
+#: lxc/main.go:123
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
@@ -1093,7 +1093,7 @@ msgstr ""
msgid "Uploaded: %s"
msgstr ""
-#: lxc/main.go:122
+#: lxc/main.go:98
#, c-format
msgid "Usage: %s"
msgstr ""
@@ -1122,7 +1122,7 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lxc/main.go:66
+#: lxc/main.go:42
msgid "`lxc config profile` is deprecated, please use `lxc profile`"
msgstr ""
@@ -1158,12 +1158,12 @@ msgstr ""
msgid "enabled"
msgstr ""
-#: lxc/main.go:25 lxc/main.go:159
+#: client.go:525 lxc/main.go:135
#, c-format
msgid "error: %v"
msgstr ""
-#: lxc/help.go:40 lxc/main.go:117
+#: lxc/help.go:40 lxc/main.go:93
#, c-format
msgid "error: unknown command: %s"
msgstr ""
@@ -1184,7 +1184,7 @@ msgstr ""
msgid "ok (y/n)?"
msgstr ""
-#: lxc/main.go:266 lxc/main.go:270
+#: lxc/main.go:242 lxc/main.go:246
#, c-format
msgid "processing aliases failed %s\n"
msgstr ""
@@ -1226,7 +1226,7 @@ msgstr ""
msgid "unreachable return reached"
msgstr ""
-#: lxc/main.go:199
+#: lxc/main.go:175
msgid "wrong number of subcommand arguments"
msgstr ""
diff --git a/test/suites/static_analysis.sh b/test/suites/static_analysis.sh
index 148d5d1..301e3ef 100644
--- a/test/suites/static_analysis.sh
+++ b/test/suites/static_analysis.sh
@@ -20,7 +20,7 @@ test_static_analysis() {
## Functions starting by empty line
OUT=$(grep -r "^$" -B1 . | grep "func " | grep -v "}$" || true)
if [ -n "${OUT}" ]; then
- echo "${OUT}"
+ echo "ERROR: Functions must not start with an empty line: ${OUT}"
false
fi
More information about the lxc-devel
mailing list