[lxc-devel] [lxd/master] Print detach message in console
stgraber on Github
lxc-bot at linuxcontainers.org
Tue Nov 14 22:43:34 UTC 2017
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 424 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20171114/767a6200/attachment.bin>
-------------- next part --------------
From 85ea34fee3ff07b7235c1a46b8096fef97992e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Nov 2017 17:42:28 -0500
Subject: [PATCH 1/2] lxc/console: Tell the user how to detach
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
lxc/console.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lxc/console.go b/lxc/console.go
index 071a67bc9..87d4e5dbc 100644
--- a/lxc/console.go
+++ b/lxc/console.go
@@ -170,6 +170,8 @@ func (c *consoleCmd) run(conf *config.Config, args []string) error {
close(consoleDisconnect)
}()
+ fmt.Printf(i18n.G("To detach from the console, press: <ctrl>+a q")+"\n\r")
+
// Run the command in the container
op, err := d.ConsoleContainer(name, req, &consoleArgs)
if err != nil {
From 76fde85ff02228fdab26c8613e33aabe87aa2a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Nov 2017 17:42:41 -0500
Subject: [PATCH 2/2] i18n: Update translation templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
po/de.po | 6 +++++-
po/el.po | 6 +++++-
po/fr.po | 6 +++++-
po/id.po | 6 +++++-
po/it.po | 6 +++++-
po/ja.po | 6 +++++-
po/lxd.pot | 6 +++++-
po/nl.po | 6 +++++-
po/ru.po | 6 +++++-
po/sr.po | 6 +++++-
po/sv.po | 6 +++++-
po/tr.po | 6 +++++-
po/zh.po | 6 +++++-
po/zh_Hans.po | 6 +++++-
14 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/po/de.po b/po/de.po
index 668a95613..f92d45297 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: 2017-02-14 17:11+0000\n"
"Last-Translator: Tim Rose <tim at netlope.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -1380,6 +1380,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/el.po b/po/el.po
index 5f06d1565..99d370c5a 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: 2017-02-14 08:00+0000\n"
"Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
"Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -1230,6 +1230,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index f3b7933a0..1e4ae8ec4 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\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/"
@@ -1364,6 +1364,10 @@ msgstr "Pour attacher un réseau à un conteneur, utiliser : lxc network attach"
msgid "To create a new network, use: lxc network create"
msgstr "Pour créer un réseau, utiliser : lxc network create"
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/id.po b/po/id.po
index b5ca7666c..09107c320 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: lxd\n"
"Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2017-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1223,6 +1223,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 748c14083..0c113efc4 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: 2017-08-18 14:22+0000\n"
"Last-Translator: Alberto Donato <alberto.donato at gmail.com>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -1249,6 +1249,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index b7b2b33d9..e3b465afe 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: 2017-09-28 20:29+0000\n"
"Last-Translator: KATOH Yasufumi <karma at jazz.email.ne.jp>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -1247,6 +1247,10 @@ msgid "To create a new network, use: lxc network create"
msgstr ""
"新しいネットワークを作成するには、lxc network create を使用してください"
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/lxd.pot b/po/lxd.pot
index 791f60d65..9aea4be84 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-11-14 07:37+0100\n"
+ "POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1208,6 +1208,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index f64b1aadd..9b59d7b3f 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1223,6 +1223,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 875728c3f..34bd71809 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: 2017-09-05 16:48+0000\n"
"Last-Translator: Ilya Yakimavets <ilya.yakimavets at backend.expert>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -1314,6 +1314,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 7f2019f29..136648727 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1223,6 +1223,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 07c4ccd9e..59a86fa74 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1223,6 +1223,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index cc12bbd65..102131403 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1223,6 +1223,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 861784ea5..71291f0cd 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1223,6 +1223,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index 4d3a31ef3..3c66b6f19 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-11-14 07:36+0100\n"
+"POT-Creation-Date: 2017-11-14 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1223,6 +1223,10 @@ msgstr ""
msgid "To create a new network, use: lxc network create"
msgstr ""
+#: lxc/console.go:173
+msgid "To detach from the console, press: <ctrl>+a q"
+msgstr ""
+
#: lxc/main.go:172
msgid "To start your first container, try: lxc launch ubuntu:16.04"
msgstr ""
More information about the lxc-devel
mailing list