[PATCH 1/1] Alignment close for pop up window completed
by papsagar＠linux.vnet.ibm.com
From: pappu <papsagar(a)in.ibm.com>
Signed-off-by: pappu <papsagar(a)in.ibm.com>
---
ui/css/theme-default/window.css | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css
index 5cb2790..f3924a3 100644
--- a/ui/css/theme-default/window.css
+++ b/ui/css/theme-default/window.css
@@ -78,7 +78,24 @@
overflow-x: hidden;
margin: 48px 0 56px;
}
-
+.window .close {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ top: 7px;
+ right: 7px;
+ -webkit-border-radius: 30px;
+ -moz-border-radius: 30px;
+ border-radius: 30px;
+ border: 2px solid #ccc;
+ color: #ccc;
+ font-size: 24px;
+ text-align: center;
+ line-height: 30px;
+ font-weight: bold;
+ background: #eee;
+ cursor: pointer;
+}
.window>header>.title,
.window>form>header>.title {
height: 48px;
--
2.1.0
8 years, 8 months
- 3
- 3
[wok] Fix bug #724: Fix test_kimchi_config
by Lucio Correia
This patch fixes Kimchi config test and adds Wok config
test.
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
plugins/kimchi/config.py.in | 6 +-
plugins/kimchi/kimchi.conf | 8 --
plugins/kimchi/tests/test_config.py.in | 148 ++++++++++++++++++++++------
plugins/kimchi/ui/images/Makefile.am | 2 +-
plugins/kimchi/ui/images/logo.ico | Bin 1214 -> 0 bytes
plugins/kimchi/ui/pages/help/dita-help.xsl | 2 +-
src/wok/config.py.in | 8 ++
7 files changed, 131 insertions(+), 43 deletions(-)
delete mode 100644 plugins/kimchi/ui/images/logo.ico
diff --git a/plugins/kimchi/config.py.in b/plugins/kimchi/config.py.in
index 65150aa..4b82e45 100644
--- a/plugins/kimchi/config.py.in
+++ b/plugins/kimchi/config.py.in
@@ -23,7 +23,7 @@ import os
import platform
import threading
-from wok.config import PluginPaths
+from wok.config import PluginConfig, PluginPaths
from wok.xmlutils.utils import xpath_get_text
kimchiLock = threading.Lock()
@@ -103,9 +103,9 @@ class KimchiPaths(PluginPaths):
kimchiPaths = KimchiPaths()
-class KimchiConfig(dict):
+class KimchiConfig(PluginConfig):
def __init__(self):
- super(KimchiConfig, self).__init__(self)
+ super(KimchiConfig, self).__init__('kimchi')
custom_config = {
'/novnc': {
diff --git a/plugins/kimchi/kimchi.conf b/plugins/kimchi/kimchi.conf
index 78f4f3f..1bf78e4 100644
--- a/plugins/kimchi/kimchi.conf
+++ b/plugins/kimchi/kimchi.conf
@@ -30,14 +30,6 @@ tools.nocache.on = False
tools.wokauth.on = True
tools.staticdir.content_types = {'xz': 'application/x-xz'}
-[/favicon.ico]
-tools.staticfile.on = True
-tools.staticfile.filename = wok.config.PluginPaths('kimchi').ui_dir + '/images/logo.ico'
-
-[/robots.txt]
-tools.staticfile.on = True
-tools.staticfile.filename = wok.config.PluginPaths('kimchi').ui_dir + '/robots.txt'
-
[/help]
tools.staticdir.on = True
tools.staticdir.dir = wok.config.PluginPaths('kimchi').ui_dir + '/pages/help'
diff --git a/plugins/kimchi/tests/test_config.py.in b/plugins/kimchi/tests/test_config.py.in
index 7b5f190..0167610 100644
--- a/plugins/kimchi/tests/test_config.py.in
+++ b/plugins/kimchi/tests/test_config.py.in
@@ -20,11 +20,11 @@
import unittest
from cherrypy.lib.reprconf import Parser
-from wok.config import Paths
+from wok.config import Paths, PluginPaths, WokConfig
from wok.plugins.kimchi.config import get_debugreports_path
from wok.plugins.kimchi.config import get_screenshot_path
-from wok.plugins.kimchi.config import KimchiPaths
+from wok.plugins.kimchi.config import KimchiConfig, KimchiPaths
get_prefix = None
@@ -90,8 +90,9 @@ class ConfigTests(unittest.TestCase):
self.assertEquals(paths.ui_dir, '/home/user/wok/plugins/kimchi/ui')
self.assertEquals(paths.mo_dir, '/home/user/wok/plugins/kimchi/mo')
- def test_kimchi_config(self):
- Paths.get_prefix = KimchiPaths.get_prefix = get_prefix
+ def test_wok_config(self):
+ Paths.get_prefix = PluginPaths.get_prefix = get_prefix
+ paths = Paths()
CACHEEXPIRES = 31536000
SESSIONSTIMEOUT = 10
configObj = {
@@ -109,56 +110,154 @@ class ConfigTests(unittest.TestCase):
'tools.sessions.timeout': SESSIONSTIMEOUT,
'tools.wokauth.on': False
},
+ '/wok-ui.html': {
+ 'tools.wokauth.on': True
+ },
+ '/css': {
+ 'tools.staticdir.on': True,
+ 'tools.staticdir.dir': '%s/ui/css' % paths.prefix,
+ 'tools.expires.on': True,
+ 'tools.expires.secs': CACHEEXPIRES,
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
+ },
+ '/fontello': {
+ 'tools.staticdir.on': True,
+ 'tools.staticdir.dir': '%s/ui/fontello' % paths.prefix,
+ 'tools.expires.on': True,
+ 'tools.expires.secs': CACHEEXPIRES,
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
+ },
+ '/js': {
+ 'tools.staticdir.on': True,
+ 'tools.staticdir.dir': '%s/ui/js' % paths.prefix,
+ 'tools.expires.on': True,
+ 'tools.expires.secs': CACHEEXPIRES,
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
+ },
+ '/libs': {
+ 'tools.staticdir.on': True,
+ 'tools.staticdir.dir': '%s/ui/libs' % paths.prefix,
+ 'tools.expires.on': True,
+ 'tools.expires.secs': CACHEEXPIRES,
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
+ },
+ '/images': {
+ 'tools.staticdir.on': True,
+ 'tools.staticdir.dir': '%s/ui/images' % paths.prefix,
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
+ },
+ '/favicon.ico': {
+ 'tools.staticfile.on': True,
+ 'tools.staticfile.filename':
+ '%s/images/logo.ico' % paths.ui_dir
+ },
+ '/robots.txt': {
+ 'tools.staticfile.on': True,
+ 'tools.staticfile.filename': '%s/robots.txt' % paths.ui_dir
+ },
+ }
+
+ wok_config = WokConfig()
+ self.assertEquals(wok_config, configObj)
+
+
+ def test_kimchi_config(self):
+ KimchiPaths.get_prefix = PluginPaths.get_prefix = get_prefix
+ paths = KimchiPaths()
+ pluginPrefix = paths.add_prefix(paths.plugin_dir)
+ CACHEEXPIRES = 31536000
+ SESSIONSTIMEOUT = 10
+ configObj = {
+ 'wok': {
+ 'enable': True,
+ 'plugin_class': "KimchiRoot",
+ 'uri': '/%s' % paths.plugin_dir,
+ 'extra_auth_api_class': "control.sub_nodes"
+ },
+ '/': {
+ 'tools.trailing_slash.on': False,
+ 'request.methods_with_bodies': ('POST', 'PUT'),
+ 'tools.nocache.on': True,
+ 'tools.proxy.on': True,
+ 'tools.sessions.on': True,
+ 'tools.sessions.name': 'wok',
+ 'tools.sessions.secure': True,
+ 'tools.sessions.httponly': True,
+ 'tools.sessions.locking': 'explicit',
+ 'tools.sessions.storage_type': 'ram',
+ 'tools.sessions.timeout': SESSIONSTIMEOUT,
+ 'tools.wokauth.on': True
+ },
'/novnc': {
'tools.staticdir.on': True,
- 'tools.staticdir.dir': KimchiPaths().novnc_dir,
+ 'tools.staticdir.dir': paths.novnc_dir,
'tools.nocache.on': True,
'tools.wokauth.on': True
},
'/spice_auto.html': {
'tools.staticfile.on': True,
- 'tools.staticfile.filename': KimchiPaths().spice_file,
+ 'tools.staticfile.filename': paths.spice_file,
'tools.nocache.on': True,
'tools.wokauth.on': True
},
'/spice-html5': {
'tools.staticdir.on': True,
- 'tools.staticdir.dir': KimchiPaths().spice_dir,
+ 'tools.staticdir.dir': paths.spice_dir,
'tools.nocache.on': True
},
'/spice-html5/spice.css': {
'tools.staticfile.on': True,
- 'tools.staticfile.filename': KimchiPaths().spice_css_file,
+ 'tools.staticfile.filename': paths.spice_css_file,
'tools.nocache.on': True,
},
- '/kimchi-ui.html': {
- 'tools.wokauth.on': True
+ '/ui/config/tab-ext.xml': {
+ 'tools.staticfile.on': True,
+ 'tools.staticfile.filename': '%s/ui/config/tab-ext.xml' %
+ pluginPrefix,
+ 'tools.nocache.on': True
},
'/css': {
'tools.staticdir.on': True,
- 'tools.staticdir.dir': '%s/ui/css' % KimchiPaths().prefix,
+ 'tools.staticdir.dir': '%s/ui/css' % pluginPrefix,
'tools.expires.on': True,
'tools.expires.secs': CACHEEXPIRES,
- 'tools.nocache.on': False
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
+ },
+ '/fontello': {
+ 'tools.staticdir.on': True,
+ 'tools.staticdir.dir': '%s/ui/fontello' % pluginPrefix,
+ 'tools.expires.on': True,
+ 'tools.expires.secs': CACHEEXPIRES,
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
},
'/js': {
'tools.staticdir.on': True,
- 'tools.staticdir.dir': '%s/ui/js' % KimchiPaths().prefix,
+ 'tools.staticdir.dir': '%s/ui/js' % pluginPrefix,
'tools.expires.on': True,
'tools.expires.secs': CACHEEXPIRES,
- 'tools.nocache.on': False
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
},
'/libs': {
'tools.staticdir.on': True,
- 'tools.staticdir.dir': '%s/ui/libs' % KimchiPaths().prefix,
+ 'tools.staticdir.dir': '%s/ui/libs' % pluginPrefix,
'tools.expires.on': True,
'tools.expires.secs': CACHEEXPIRES,
'tools.nocache.on': False,
+ 'tools.wokauth.on': False,
},
'/images': {
'tools.staticdir.on': True,
- 'tools.staticdir.dir': '%s/ui/images' % KimchiPaths().prefix,
- 'tools.nocache.on': False
+ 'tools.staticdir.dir': '%s/ui/images' % pluginPrefix,
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': False
},
'/data/screenshots': {
'tools.staticdir.on': True,
@@ -172,24 +271,13 @@ class ConfigTests(unittest.TestCase):
'tools.wokauth.on': True,
'tools.staticdir.content_types': {'xz': 'application/x-xz'}
},
- '/favicon.ico': {
- 'tools.staticfile.on': True,
- 'tools.staticfile.filename':
- '%s/images/logo.ico' % KimchiPaths().ui_dir
- },
- '/robots.txt': {
- 'tools.staticfile.on': True,
- 'tools.staticfile.filename': '%s/robots.txt' %
- KimchiPaths().ui_dir
- },
'/help': {
'tools.staticdir.on': True,
- 'tools.staticdir.dir': '%s/ui/pages/help' %
- KimchiPaths().prefix,
- 'tools.staticdir.index': 'en_US/index.html',
+ 'tools.staticdir.dir': '%s/ui/pages/help' % pluginPrefix,
'tools.nocache.on': True
}
}
kimchi_config = Parser().dict_from_file(KimchiPaths().conf_file)
+ kimchi_config.update(KimchiConfig())
self.assertEquals(kimchi_config, configObj)
diff --git a/plugins/kimchi/ui/images/Makefile.am b/plugins/kimchi/ui/images/Makefile.am
index 0562e6a..ca3ee6e 100644
--- a/plugins/kimchi/ui/images/Makefile.am
+++ b/plugins/kimchi/ui/images/Makefile.am
@@ -19,4 +19,4 @@ SUBDIRS = theme-default
imagedir = $(datadir)/wok/plugins/kimchi/ui/images
-dist_image_DATA = *.png *.ico
+dist_image_DATA = *.png
diff --git a/plugins/kimchi/ui/images/logo.ico b/plugins/kimchi/ui/images/logo.ico
deleted file mode 100644
index 446143f066a60f479b2cb8f8d04ab3c97ff60e56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1214
zcma)*3rLeu6vyu=X_;nPV)$&PPF)r(wTQ|dTGOUtnOdf0mZ=cR#99xbub1{BqnD9^
z^Z>PV6h)fUny6#CN{3di2P{*h2ek@Oq0a4o*=I}2Iv?krbAR`oKi_vQA0faVCr83o
zF{!X2#Dx$Nz}$(sm^sgR<Jj30yCMGpMl1z837jm3H1$<DU4IV>Tbdw<FM-;Hi<#et
z=I}n~iB^qh8{XzCNyvT<I;$&znmT~?eFXZgAE@Om?1h(6Iq+2e1-ca!zOAO7n3*};
zXq6n?2kF<!f%cez;-Fgx4$e+xo{WR;oqhc_OW;#nF!Zm|JK}m8gi6aC+##`QA5PmJ
zfeZ(o(}%&&1P5#*1vVbnssk~XhN5bNz=T)>5^+BS=V54SJ|^z)5I7%kU;>-skiq*{
z5B^=eF<T)pK9+)bV;9UCK>t-HOi+bkR-wK1xpfXL;S<?ho1pQ5gYzxiHR~=e+XHS(
zYe7QMZb3IjWV72H-JpD~6z(tbgwn1o$D2s!YteWNJS!i9l%iW?+34Lvr*KL(6{_X|
zobEjAb{lD|4qsmYvGF;~r0Aunc#>=c)0W4s|D{#(q9~vaX{rGms=((Wn*~LeWqIu}
zkGvlzwaxjL25hey2bVweu<xK*t+@Oa_)UKTK^x4IwmKMOjm@oL`l)}_NGPy}tdb}w
zHa>H`ji2N7m}Xsj#j7-`#=Dv}`)h&)9th^&^dR%>WH_MB8KcIXVf8p&s1xD|_k)R-
zrk$Z0-|Gf}&4Au$KhU$k?3YR5by~D9M&-q$=ocNz4!IY&p7%OxuJf&+Ei-G(23hU;
zHTLhMtjFR9ExVbPQVLzBFlROcIZ|#jmX6fm_hsVa3XP<aKAeAt8dqp&oBW=V^+d>Q
zkcNnm%Ds?ggd^Rv2~9_o82cv;p6LSBD_g_s-n1uZ8#<EeLwTm~LE9J!Zdo@M&*jFU
zoM+Z%F5)(8$8y`Wz~%Pd;Nlx@aH{<lk}}CcRMRXZMD&%Uhz3Ze$jpg#uec1IlFMPW
MDQ4iZEk#_;cNAJoqyPW_
diff --git a/plugins/kimchi/ui/pages/help/dita-help.xsl b/plugins/kimchi/ui/pages/help/dita-help.xsl
index 8583a4e..45f0a3b 100644
--- a/plugins/kimchi/ui/pages/help/dita-help.xsl
+++ b/plugins/kimchi/ui/pages/help/dita-help.xsl
@@ -9,7 +9,7 @@
<head>
<title><xsl:value-of select="/cshelp/title" /></title>
<meta charset="UTF-8" />
- <link rel="shortcut icon" href="../../images/logo.ico" />
+ <link rel="shortcut icon" href="images/logo.ico" />
<link rel="stylesheet" type="text/css" href="../kimchi.css" />
</head>
<body>
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 08da028..82a6c8b 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -145,6 +145,14 @@ class WokConfig(dict):
'/wok-ui.html': {
'tools.wokauth.on': True
},
+ '/favicon.ico': {
+ 'tools.staticfile.on': True,
+ 'tools.staticfile.filename': '%s/images/logo.ico' % paths.ui_dir
+ },
+ '/robots.txt': {
+ 'tools.staticfile.on': True,
+ 'tools.staticfile.filename': '%s/robots.txt' % paths.ui_dir
+ },
}
def __init__(self):
--
1.7.1
8 years, 8 months
- 2
- 1
[wok] Move network and netinfo modules to kimchi plugin
by Lucio Correia
The modules network and netinfo are specific to kimchi. This
patch moves them from wok to kimchi plugin and adapts the
respective imports.
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
plugins/kimchi/model/host.py | 2 +-
plugins/kimchi/model/interfaces.py | 2 +-
plugins/kimchi/model/networks.py | 4 ++--
{src/wok => plugins/kimchi}/netinfo.py | 0
{src/wok => plugins/kimchi}/network.py | 0
plugins/kimchi/tests/test_model.py | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
rename {src/wok => plugins/kimchi}/netinfo.py (100%)
rename {src/wok => plugins/kimchi}/network.py (100%)
diff --git a/plugins/kimchi/model/host.py b/plugins/kimchi/model/host.py
index 3ff034c..8c891a1 100644
--- a/plugins/kimchi/model/host.py
+++ b/plugins/kimchi/model/host.py
@@ -25,7 +25,6 @@ import time
from cherrypy.process.plugins import BackgroundTask
from collections import defaultdict
-from wok import netinfo
from wok.basemodel import Singleton
from wok.exception import InvalidOperation, InvalidParameter
from wok.exception import NotFoundError, OperationFailed
@@ -34,6 +33,7 @@ from wok.xmlutils.utils import xpath_get_text
import hostdev
from .. import disks
+from .. import netinfo
from ..repositories import Repositories
from ..swupdate import SoftwareUpdate
from config import CapabilitiesModel
diff --git a/plugins/kimchi/model/interfaces.py b/plugins/kimchi/model/interfaces.py
index 81b379a..149afe3 100644
--- a/plugins/kimchi/model/interfaces.py
+++ b/plugins/kimchi/model/interfaces.py
@@ -17,9 +17,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-from wok import netinfo
from wok.exception import NotFoundError
+from .. import netinfo
from networks import NetworksModel
diff --git a/plugins/kimchi/model/networks.py b/plugins/kimchi/model/networks.py
index 57af9e7..621055e 100644
--- a/plugins/kimchi/model/networks.py
+++ b/plugins/kimchi/model/networks.py
@@ -23,8 +23,6 @@ import sys
import time
from xml.sax.saxutils import escape
-from wok import netinfo
-from wok import network as knetwork
from wok.config import PluginPaths
from wok.exception import InvalidOperation, InvalidParameter
from wok.exception import MissingParameter, NotFoundError, OperationFailed
@@ -32,6 +30,8 @@ from wok.rollbackcontext import RollbackContext
from wok.utils import run_command, wok_log
from wok.xmlutils.utils import xpath_get_text
+from .. import netinfo
+from .. import network as knetwork
from ..osinfo import defaults as tmpl_defaults
from ..xmlutils.network import create_vlan_tagged_bridge_xml
from ..xmlutils.network import to_network_xml
diff --git a/src/wok/netinfo.py b/plugins/kimchi/netinfo.py
similarity index 100%
rename from src/wok/netinfo.py
rename to plugins/kimchi/netinfo.py
diff --git a/src/wok/network.py b/plugins/kimchi/network.py
similarity index 100%
rename from src/wok/network.py
rename to plugins/kimchi/network.py
diff --git a/plugins/kimchi/tests/test_model.py b/plugins/kimchi/tests/test_model.py
index c70e4fb..027b3c2 100644
--- a/plugins/kimchi/tests/test_model.py
+++ b/plugins/kimchi/tests/test_model.py
@@ -28,7 +28,6 @@ import unittest
import uuid
import wok.objectstore
-from wok import netinfo
from wok.basemodel import Singleton
from wok.config import config
from wok.exception import InvalidOperation
@@ -36,6 +35,7 @@ from wok.exception import InvalidParameter, NotFoundError, OperationFailed
from wok.rollbackcontext import RollbackContext
from wok.utils import add_task
+from wok.plugins.kimchi import netinfo
from wok.plugins.kimchi.osinfo import get_template_default
from wok.plugins.kimchi.model import model
from wok.plugins.kimchi.model.libvirtconnection import LibvirtConnection
--
1.7.1
8 years, 8 months
- 2
- 4
[PATCH] Add volume to storage label not formatted properly
by Socorro Stoppler
From: Socorro Stoppler <socorrob(a)us.ibm.com>
Add volume to storage label is not formatted properly in the following
languages: Portuguese(Brazil) and Spanish
Tested all languages supported and all is good now.
Socorro Stoppler (1):
Add volume to storage pool label not formatted properly in some
languages
ui/css/theme-default/storagepool-add-volume.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.9.1
8 years, 8 months
- 1
- 0
[PATCH 0/3] Issue #727 - Improve repo url check
by Jose Ricardo Ziviani
This patch aims to improve the repo url check. It expands variables used
to compose the url and handles url redirection if the server returns
that.
Jose Ricardo Ziviani (3):
Implement a method to expand variables in a url
Expands all possible variables in a repo url to validate it
Handles http redirection when checking url path
src/kimchi/repositories.py | 16 ++++++++--------
src/kimchi/utils.py | 16 +++++++++++++---
src/kimchi/yumparser.py | 24 ++++++++++++++++++------
3 files changed, 39 insertions(+), 17 deletions(-)
--
1.9.1
8 years, 8 months
- 2
- 4
[PATCH WOK] Add fontawesome-fonts as dependency and expose .ttf file on web server
by Aline Manera
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
contrib/DEBIAN/control.in | 3 ++-
contrib/wok.spec.fedora.in | 1 +
contrib/wok.spec.suse.in | 1 +
src/wok/config.py.in | 19 +++++++++++++++++++
4 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index ef4e0c2..5d65bd0 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -15,7 +15,8 @@ Depends: python-cherrypy3 (>= 3.2.0),
python-lxml,
nginx,
python-ldap,
- spice-html5
+ spice-html5,
+ fonts-font-awesome
Build-Depends: libxslt,
openssl,
python-lxml
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index 30319a9..e82f946 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -19,6 +19,7 @@ Requires: python-jsonschema >= 1.3.0
Requires: python-lxml
Requires: nginx
Requires: python-ldap
+Requires: fontawesome-fonts
BuildRequires: libxslt
BuildRequires: openssl
BuildRequires: python-lxml
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
index 63bdce3..0e9117e 100644
--- a/contrib/wok.spec.suse.in
+++ b/contrib/wok.spec.suse.in
@@ -20,6 +20,7 @@ Requires: python-ldap
Requires: python-lxml
Requires: python-xml
Requires: nginx
+Requires: fontawesome-fonts
BuildRequires: libxslt-tools
BuildRequires: openssl
BuildRequires: python-lxml
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 08da028..6b8951d 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -60,6 +60,18 @@ class Paths(object):
self.plugins_dir = self.add_prefix('plugins')
self.mo_dir = self.add_prefix('mo')
+ self.fontawesome_file = None
+ for path in ['/usr/share/fonts/fontawesome',
+ '/usr/share/fonts/truetype/font-awesome',
+ '/usr/share/fonts/truetype']:
+ if os.path.exists(path):
+ self.fontawesome_file = os.path.join(path,
+ 'fontawesome-webfont.ttf')
+ break
+
+ if self.fontawesome_file is None:
+ raise Exception("Font Awesome is not installed.")
+
def get_prefix(self):
if __file__.startswith("/"):
base = os.path.dirname(__file__)
@@ -120,6 +132,13 @@ class UIConfig(dict):
ui_configs['/' + sub_dir].update({
'tools.expires.on': True,
'tools.expires.secs': self.CACHEEXPIRES})
+
+ ui_configs['/fontawesome/font/fontawesome-webfont.ttf'] = {
+ 'tools.staticfile.on': True,
+ 'tools.staticfile.filename': paths.fontawesome_file,
+ 'tools.wokauth.on': False,
+ 'tools.nocache.on': False}
+
self.update(ui_configs)
--
2.1.0
8 years, 8 months
- 1
- 0
[PATCH v2] Add translation for "Users" and "Groups" on guest edit
by Ramon Medeiros
Changes:
v2:
Remove fuzzy translations
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
po/de_DE.po | 132 ++++++++++++++++++++++++-----------------
po/en_US.po | 104 +++++++++++++++++++-------------
po/es_ES.po | 132 ++++++++++++++++++++++++-----------------
po/fr_FR.po | 134 +++++++++++++++++++++++++-----------------
po/it_IT.po | 132 ++++++++++++++++++++++++-----------------
po/ja_JP.po | 128 ++++++++++++++++++++++++----------------
po/kimchi.pot | 105 +++++++++++++++++++--------------
po/ko_KR.po | 130 +++++++++++++++++++++++-----------------
po/pt_BR.po | 132 ++++++++++++++++++++++++-----------------
po/ru_RU.po | 130 +++++++++++++++++++++++-----------------
po/zh_CN.po | 126 +++++++++++++++++++++++----------------
po/zh_TW.po | 129 +++++++++++++++++++++++-----------------
ui/pages/guest-edit.html.tmpl | 8 +--
13 files changed, 900 insertions(+), 622 deletions(-)
diff --git a/po/de_DE.po b/po/de_DE.po
index 439dce4..64ce72a 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -310,13 +310,6 @@ msgstr ""
"Virtuelle Maschine %(name)s konnte nicht heruntergefahren werden. Details: "
"%(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-"Zugriff auf die Metadaten der virtuellen Maschine %(name)s nicht möglich. "
-"Details: %(err)s"
-
msgid "The guest console password must be a string."
msgstr "Das Konsolenkennwort des Gastes muss eine Zeichenfolge sein."
@@ -407,6 +400,21 @@ msgstr ""
msgid "Error attaching memory device. Details: %(error)s"
msgstr "Fehler beim Anschließen der Speichereinheit. Details: %(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1520,6 +1528,12 @@ msgstr "MAC-Adresse"
msgid "Available system users and groups"
msgstr "Verfügbare Systembenutzer und -gruppen"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "Ausgewählte Systembenutzer und -gruppen"
@@ -1562,37 +1576,6 @@ msgstr "Abbrechen"
msgid "revert"
msgstr "zurücksetzen"
-msgid "Add a Storage Device to VM"
-msgstr "Speichereinheit zur virtuellen Maschine hinzufügen"
-
-msgid "Device Type"
-msgstr "Einheitentyp"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr ""
-"Der Einheitentyp. Derzeit werden nur \"cdrom\" und \"disk\" unterstützt."
-
-msgid "Storage Pool"
-msgstr "Speicherpool"
-
-msgid "Storage pool which volume located in"
-msgstr "Speicherpool, in dem sich der Datenträger befindet"
-
-msgid "Storage Volume"
-msgstr "Speicherdatenträger"
-
-msgid "Storage volume to be attached"
-msgstr "Anzuhängender Speicherdatenträger"
-
-msgid "File Path"
-msgstr "Dateipfad"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM."
-
-msgid "Attach"
-msgstr "Anhängen"
-
msgid "Start"
msgstr "Starten"
@@ -1626,6 +1609,37 @@ msgstr "Herunterfahren"
msgid "Delete"
msgstr "Löschen"
+msgid "Add a Storage Device to VM"
+msgstr "Speichereinheit zur virtuellen Maschine hinzufügen"
+
+msgid "Device Type"
+msgstr "Einheitentyp"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr ""
+"Der Einheitentyp. Derzeit werden nur \"cdrom\" und \"disk\" unterstützt."
+
+msgid "Storage Pool"
+msgstr "Speicherpool"
+
+msgid "Storage pool which volume located in"
+msgstr "Speicherpool, in dem sich der Datenträger befindet"
+
+msgid "Storage Volume"
+msgstr "Speicherdatenträger"
+
+msgid "Storage volume to be attached"
+msgstr "Anzuhängender Speicherdatenträger"
+
+msgid "File Path"
+msgstr "Dateipfad"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM."
+
+msgid "Attach"
+msgstr "Anhängen"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist "
@@ -1649,6 +1663,9 @@ msgstr "Gäste"
msgid "Templates"
msgstr "Vorlagen"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "Anwendungskonfiguration konnte nicht abgerufen werden"
@@ -2182,21 +2199,6 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-msgid "Add a Volume to Storage Pool"
-msgstr "Datenträger zu Speicherpool hinzufügen"
-
-msgid "Fetch from remote URL"
-msgstr "Über Remote URL abrufen"
-
-msgid "Enter the remote URL here."
-msgstr "Remote URL hier eingeben."
-
-msgid "Upload a file"
-msgstr "Datei hochladen"
-
-msgid "Choose the file you want to upload."
-msgstr "Wählen Sie die hochzuladende Datei aus."
-
msgid "Define a New Storage Pool"
msgstr "Neuen Speicherpool definieren"
@@ -2275,6 +2277,21 @@ msgstr "SCSI-Adapter"
msgid "Please, wait..."
msgstr "Bitte warten..."
+msgid "Add a Volume to Storage Pool"
+msgstr "Datenträger zu Speicherpool hinzufügen"
+
+msgid "Fetch from remote URL"
+msgstr "Über Remote URL abrufen"
+
+msgid "Enter the remote URL here."
+msgstr "Remote URL hier eingeben."
+
+msgid "Upload a file"
+msgstr "Datei hochladen"
+
+msgid "Choose the file you want to upload."
+msgstr "Wählen Sie die hochzuladende Datei aus."
+
msgid "Add Template"
msgstr "Vorlage hinzufügen"
@@ -2476,3 +2493,10 @@ msgstr "Zuordnung"
msgid "No templates found."
msgstr "Keine Vorlagen gefunden."
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "Zugriff auf die Metadaten der virtuellen Maschine %(name)s nicht möglich. "
+#~ "Details: %(err)s"
diff --git a/po/en_US.po b/po/en_US.po
index 26dbaac..3539989 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -267,11 +267,6 @@ msgstr ""
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr ""
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
msgid "The guest console password must be a string."
msgstr ""
@@ -340,6 +335,22 @@ msgid "Error attaching memory device. Details: %(error)s"
msgstr ""
#, python-format
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -1271,6 +1282,12 @@ msgstr ""
msgid "Available system users and groups"
msgstr ""
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr ""
@@ -1313,67 +1330,67 @@ msgstr ""
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
+msgid "Start"
msgstr ""
-msgid "Device Type"
+msgid "Reset"
msgstr ""
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgid "Pause"
msgstr ""
-msgid "Storage Pool"
+msgid "Resume"
msgstr ""
-msgid "Storage pool which volume located in"
+msgid "Power Off"
msgstr ""
-msgid "Storage Volume"
+msgid "Actions"
msgstr ""
-msgid "Storage volume to be attached"
+msgid "Connect"
msgstr ""
-msgid "File Path"
+msgid "Clone"
msgstr ""
-msgid "The ISO file path in the server for CDROM."
+msgid "Edit"
msgstr ""
-msgid "Attach"
+msgid "Shut Down"
msgstr ""
-msgid "Start"
+msgid "Delete"
msgstr ""
-msgid "Reset"
+msgid "Add a Storage Device to VM"
msgstr ""
-msgid "Pause"
+msgid "Device Type"
msgstr ""
-msgid "Resume"
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
-msgid "Power Off"
+msgid "Storage Pool"
msgstr ""
-msgid "Actions"
+msgid "Storage pool which volume located in"
msgstr ""
-msgid "Connect"
+msgid "Storage Volume"
msgstr ""
-msgid "Clone"
+msgid "Storage volume to be attached"
msgstr ""
-msgid "Edit"
+msgid "File Path"
msgstr ""
-msgid "Shut Down"
+msgid "The ISO file path in the server for CDROM."
msgstr ""
-msgid "Delete"
+msgid "Attach"
msgstr ""
msgid "The username or password you entered is incorrect. Please try again."
@@ -1397,6 +1414,9 @@ msgstr ""
msgid "Templates"
msgstr ""
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr ""
@@ -1878,21 +1898,6 @@ msgstr ""
msgid "No"
msgstr ""
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr ""
@@ -1963,6 +1968,21 @@ msgstr ""
msgid "Please, wait..."
msgstr ""
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 173af93..1e29291 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -304,13 +304,6 @@ msgstr "No existe el grupo (o grupos) '%(groups)s'"
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr "No se puede apagar la máquina virtual %(name)s. Detalles: %(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-"No se puede obtener acceso a los metadatos de la máquina virtual %(name)s. "
-"Detalles: %(err)s"
-
msgid "The guest console password must be a string."
msgstr "La contraseña de la consola del invitado debe ser una serie. "
@@ -393,6 +386,21 @@ msgstr ""
msgid "Error attaching memory device. Details: %(error)s"
msgstr "Error al conectar el dispositivo de memoria. Detalles: %(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1518,6 +1526,12 @@ msgstr "Dirección MAC"
msgid "Available system users and groups"
msgstr "Usuarios y grupos del sistema disponibles"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "Usuarios y grupos del sistema seleccionados"
@@ -1560,37 +1574,6 @@ msgstr "Cancelar"
msgid "revert"
msgstr "revertir"
-msgid "Add a Storage Device to VM"
-msgstr "Añadir un dispositivo de almacenamiento a VM"
-
-msgid "Device Type"
-msgstr "Tipo de dispositivo"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr ""
-"El tipo de dispositivo. Actualmente se da soporte a \"cdrom\" y \"disk\"."
-
-msgid "Storage Pool"
-msgstr "Agrupación de almacenamiento"
-
-msgid "Storage pool which volume located in"
-msgstr "Agrupación de almacenamiento con volumen ubicado en"
-
-msgid "Storage Volume"
-msgstr "Volumen de almacenamiento"
-
-msgid "Storage volume to be attached"
-msgstr "Volumen de almacenamiento que se va a adjuntar"
-
-msgid "File Path"
-msgstr "Vía de acceso de archivo"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM."
-
-msgid "Attach"
-msgstr "Conectar"
-
msgid "Start"
msgstr "Iniciar"
@@ -1624,6 +1607,37 @@ msgstr "Concluir"
msgid "Delete"
msgstr "Suprimir"
+msgid "Add a Storage Device to VM"
+msgstr "Añadir un dispositivo de almacenamiento a VM"
+
+msgid "Device Type"
+msgstr "Tipo de dispositivo"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr ""
+"El tipo de dispositivo. Actualmente se da soporte a \"cdrom\" y \"disk\"."
+
+msgid "Storage Pool"
+msgstr "Agrupación de almacenamiento"
+
+msgid "Storage pool which volume located in"
+msgstr "Agrupación de almacenamiento con volumen ubicado en"
+
+msgid "Storage Volume"
+msgstr "Volumen de almacenamiento"
+
+msgid "Storage volume to be attached"
+msgstr "Volumen de almacenamiento que se va a adjuntar"
+
+msgid "File Path"
+msgstr "Vía de acceso de archivo"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM."
+
+msgid "Attach"
+msgstr "Conectar"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"El nombre de usuario o contraseña que ha especificado es incorrecto. Por "
@@ -1647,6 +1661,9 @@ msgstr "Invitados"
msgid "Templates"
msgstr "Plantillas"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "No se ha podido obtener la configuración de la aplicación"
@@ -2182,21 +2199,6 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-msgid "Add a Volume to Storage Pool"
-msgstr "Añadir un volumen a la agrupación de almacenamiento"
-
-msgid "Fetch from remote URL"
-msgstr "Captar de URL remoto"
-
-msgid "Enter the remote URL here."
-msgstr "Escriba el URL remoto aquí. "
-
-msgid "Upload a file"
-msgstr "Cargar un archivo"
-
-msgid "Choose the file you want to upload."
-msgstr "Elija el archivo que desee cargar. "
-
msgid "Define a New Storage Pool"
msgstr "Definir una agrupación de almacenamiento nueva"
@@ -2273,6 +2275,21 @@ msgstr "Adaptador SCSI"
msgid "Please, wait..."
msgstr "Por favor, espere..."
+msgid "Add a Volume to Storage Pool"
+msgstr "Añadir un volumen a la agrupación de almacenamiento"
+
+msgid "Fetch from remote URL"
+msgstr "Captar de URL remoto"
+
+msgid "Enter the remote URL here."
+msgstr "Escriba el URL remoto aquí. "
+
+msgid "Upload a file"
+msgstr "Cargar un archivo"
+
+msgid "Choose the file you want to upload."
+msgstr "Elija el archivo que desee cargar. "
+
msgid "Add Template"
msgstr "Añadir plantilla"
@@ -2475,3 +2492,10 @@ msgstr "Asignación"
msgid "No templates found."
msgstr "No se han encontrado plantillas."
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "No se puede obtener acceso a los metadatos de la máquina virtual "
+#~ "%(name)s. Detalles: %(err)s"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 42bb004..2a6642a 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -314,13 +314,6 @@ msgstr "Le ou les groupes '%(groups)s' n'existent pas"
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr "Impossible d'arrêter la machine virtuelle %(name)s. Détails : %(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-"Impossible d'obtenir l'accès aux métadonnées de la machine virtuelle "
-"%(name)s. Détails : %(err)s"
-
msgid "The guest console password must be a string."
msgstr "Le mot de passe de la console invité doit être une chaîne."
@@ -409,6 +402,21 @@ msgstr ""
msgid "Error attaching memory device. Details: %(error)s"
msgstr "Erreur d'attachement de l'unité de mémoire. Détails : %(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1522,6 +1530,12 @@ msgstr "Adresse MAC"
msgid "Available system users and groups"
msgstr "Groupes et utilisateurs système disponibles"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "Groupes et utilisateurs système sélectionnés"
@@ -1564,38 +1578,6 @@ msgstr "Annuler"
msgid "revert"
msgstr "rétablir"
-msgid "Add a Storage Device to VM"
-msgstr "Ajouter une unité de stockage à la machine virtuelle"
-
-msgid "Device Type"
-msgstr "Type d'unité"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr ""
-"Type d'unité. Actuellement, \"cdrom\" et \"disk\" seulement sont pris en "
-"charge."
-
-msgid "Storage Pool"
-msgstr "Pool de stockage"
-
-msgid "Storage pool which volume located in"
-msgstr "Pool de stockage dans lequel le volume est situé"
-
-msgid "Storage Volume"
-msgstr "Volume de stockage"
-
-msgid "Storage volume to be attached"
-msgstr "Volume de stockage à attacher"
-
-msgid "File Path"
-msgstr "Chemin d'accès au fichier"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Chemin d'accès au fichier ISO sur le serveur pour le CD-ROM."
-
-msgid "Attach"
-msgstr "Attacher"
-
msgid "Start"
msgstr "Démarrer"
@@ -1629,6 +1611,38 @@ msgstr "Arrêter"
msgid "Delete"
msgstr "Supprimer"
+msgid "Add a Storage Device to VM"
+msgstr "Ajouter une unité de stockage à la machine virtuelle"
+
+msgid "Device Type"
+msgstr "Type d'unité"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr ""
+"Type d'unité. Actuellement, \"cdrom\" et \"disk\" seulement sont pris en "
+"charge."
+
+msgid "Storage Pool"
+msgstr "Pool de stockage"
+
+msgid "Storage pool which volume located in"
+msgstr "Pool de stockage dans lequel le volume est situé"
+
+msgid "Storage Volume"
+msgstr "Volume de stockage"
+
+msgid "Storage volume to be attached"
+msgstr "Volume de stockage à attacher"
+
+msgid "File Path"
+msgstr "Chemin d'accès au fichier"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Chemin d'accès au fichier ISO sur le serveur pour le CD-ROM."
+
+msgid "Attach"
+msgstr "Attacher"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Le nom d'utilisateur ou le mot de passe entré est incorrect. Veuillez "
@@ -1652,6 +1666,9 @@ msgstr "Invités"
msgid "Templates"
msgstr "Modèles"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "Echec d'obtention de la configuration d'application"
@@ -2188,21 +2205,6 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-msgid "Add a Volume to Storage Pool"
-msgstr "Ajouter un volume au pool de stockage"
-
-msgid "Fetch from remote URL"
-msgstr "Extraire de l'URL distante"
-
-msgid "Enter the remote URL here."
-msgstr "Indiquez ici l'URL distante."
-
-msgid "Upload a file"
-msgstr "Télécharger un fichier"
-
-msgid "Choose the file you want to upload."
-msgstr "Sélectionnez le fichier à télécharger."
-
msgid "Define a New Storage Pool"
msgstr "Définir un nouveau pool de stockage"
@@ -2280,6 +2282,21 @@ msgstr "Adaptateur SCSI"
msgid "Please, wait..."
msgstr "Veuillez patienter..."
+msgid "Add a Volume to Storage Pool"
+msgstr "Ajouter un volume au pool de stockage"
+
+msgid "Fetch from remote URL"
+msgstr "Extraire de l'URL distante"
+
+msgid "Enter the remote URL here."
+msgstr "Indiquez ici l'URL distante."
+
+msgid "Upload a file"
+msgstr "Télécharger un fichier"
+
+msgid "Choose the file you want to upload."
+msgstr "Sélectionnez le fichier à télécharger."
+
msgid "Add Template"
msgstr "Ajouter un modèle"
@@ -2480,3 +2497,10 @@ msgstr "Allocation"
msgid "No templates found."
msgstr "Aucun modèle trouvé."
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "Impossible d'obtenir l'accès aux métadonnées de la machine virtuelle "
+#~ "%(name)s. Détails : %(err)s"
diff --git a/po/it_IT.po b/po/it_IT.po
index 5d0b407..8500df5 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -298,13 +298,6 @@ msgstr "Il gruppo o i gruppi '%(groups)s' non esistono"
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr "Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-"Impossibile ottenere i metadati di accesso della macchina virtuale %(name)s. "
-"Dettagli: %(err)s"
-
msgid "The guest console password must be a string."
msgstr ""
"La password della console della macchina guest deve essere una stringa. "
@@ -388,6 +381,21 @@ msgstr ""
"Errore durante il collegamento del dispositivo di memoria. Dettagli: "
"%(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1481,6 +1489,12 @@ msgstr "Indirizzo MAC"
msgid "Available system users and groups"
msgstr "Utenti e gruppi di sistema disponibili"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "Utenti e gruppi di sistema selezionati"
@@ -1523,37 +1537,6 @@ msgstr "Annulla"
msgid "revert"
msgstr "Inverti"
-msgid "Add a Storage Device to VM"
-msgstr "Aggiungi un dispositivo di memoria alla VM"
-
-msgid "Device Type"
-msgstr "Tipo dispositivo"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr ""
-"Il tipo di dispositivo. Attualmente, sono supportati \"cdrom\" e \"disk\"."
-
-msgid "Storage Pool"
-msgstr "Pool di memoria"
-
-msgid "Storage pool which volume located in"
-msgstr "Pool di memoria in cui si trova il volume"
-
-msgid "Storage Volume"
-msgstr "Volume di memoria"
-
-msgid "Storage volume to be attached"
-msgstr "Volume di memoria oggetto del collegamento"
-
-msgid "File Path"
-msgstr "Percorso file"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Il percorso file ISO nel server per CDROM."
-
-msgid "Attach"
-msgstr "Allega"
-
msgid "Start"
msgstr "Avvia"
@@ -1587,6 +1570,37 @@ msgstr "Arresta"
msgid "Delete"
msgstr "Elimina"
+msgid "Add a Storage Device to VM"
+msgstr "Aggiungi un dispositivo di memoria alla VM"
+
+msgid "Device Type"
+msgstr "Tipo dispositivo"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr ""
+"Il tipo di dispositivo. Attualmente, sono supportati \"cdrom\" e \"disk\"."
+
+msgid "Storage Pool"
+msgstr "Pool di memoria"
+
+msgid "Storage pool which volume located in"
+msgstr "Pool di memoria in cui si trova il volume"
+
+msgid "Storage Volume"
+msgstr "Volume di memoria"
+
+msgid "Storage volume to be attached"
+msgstr "Volume di memoria oggetto del collegamento"
+
+msgid "File Path"
+msgstr "Percorso file"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Il percorso file ISO nel server per CDROM."
+
+msgid "Attach"
+msgstr "Allega"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Il nome utente o la password immessi non sono corretti. Ripetere "
@@ -1610,6 +1624,9 @@ msgstr "Guest"
msgid "Templates"
msgstr "Modelli"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "Richiamo della configurazione dell'applicazione non riuscito"
@@ -2143,21 +2160,6 @@ msgstr "Sì"
msgid "No"
msgstr "No"
-msgid "Add a Volume to Storage Pool"
-msgstr "Aggiungi un volume al pool di memoria"
-
-msgid "Fetch from remote URL"
-msgstr "Richiama da URL remoto"
-
-msgid "Enter the remote URL here."
-msgstr "Immettere qui l'URL remoto. "
-
-msgid "Upload a file"
-msgstr "Carica un file"
-
-msgid "Choose the file you want to upload."
-msgstr "Selezionare il file da caricare. "
-
msgid "Define a New Storage Pool"
msgstr "Definisci un nuovo pool di memoria"
@@ -2237,6 +2239,21 @@ msgstr "Adattatore SCSI"
msgid "Please, wait..."
msgstr "Attendere..."
+msgid "Add a Volume to Storage Pool"
+msgstr "Aggiungi un volume al pool di memoria"
+
+msgid "Fetch from remote URL"
+msgstr "Richiama da URL remoto"
+
+msgid "Enter the remote URL here."
+msgstr "Immettere qui l'URL remoto. "
+
+msgid "Upload a file"
+msgstr "Carica un file"
+
+msgid "Choose the file you want to upload."
+msgstr "Selezionare il file da caricare. "
+
msgid "Add Template"
msgstr "Aggiungi modello"
@@ -2438,3 +2455,10 @@ msgstr "Assegnazione"
msgid "No templates found."
msgstr "Nessun modello trovato."
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "Impossibile ottenere i metadati di accesso della macchina virtuale "
+#~ "%(name)s. Dettagli: %(err)s"
diff --git a/po/ja_JP.po b/po/ja_JP.po
index a95a210..5da8882 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -286,12 +286,6 @@ msgstr "グループ「%(groups)s」は存在しません"
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr "仮想マシン %(name)s をシャットダウンできません。詳細: %(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-"仮想マシン %(name)s のアクセス・メタデータを取得できません。詳細: %(err)s"
-
msgid "The guest console password must be a string."
msgstr "ゲスト・コンソール・パスワードはストリングでなければなりません。"
@@ -367,6 +361,21 @@ msgstr ""
msgid "Error attaching memory device. Details: %(error)s"
msgstr "メモリー・デバイスの接続エラーです。詳細: %(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1472,6 +1481,12 @@ msgstr "MAC アドレス"
msgid "Available system users and groups"
msgstr "使用可能なシステム・ユーザーおよびグループ"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "選択されたシステム・ユーザーおよびグループ"
@@ -1514,36 +1529,6 @@ msgstr "取消"
msgid "revert"
msgstr "戻す"
-msgid "Add a Storage Device to VM"
-msgstr "VM にストレージ・デバイスを追加"
-
-msgid "Device Type"
-msgstr "デバイス・タイプ"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "デバイス・タイプ。現在、「cdrom」と「disk」がサポートされています。"
-
-msgid "Storage Pool"
-msgstr "ストレージ・プール"
-
-msgid "Storage pool which volume located in"
-msgstr "ボリュームが含まれているストレージ・プール"
-
-msgid "Storage Volume"
-msgstr "ストレージ・ボリューム"
-
-msgid "Storage volume to be attached"
-msgstr "接続されるストレージ・ボリューム"
-
-msgid "File Path"
-msgstr "ファイル・パス"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "サーバー内での CDROM の ISO ファイル・パス。"
-
-msgid "Attach"
-msgstr "接続"
-
msgid "Start"
msgstr "開始"
@@ -1577,6 +1562,36 @@ msgstr "シャットダウン"
msgid "Delete"
msgstr "削除"
+msgid "Add a Storage Device to VM"
+msgstr "VM にストレージ・デバイスを追加"
+
+msgid "Device Type"
+msgstr "デバイス・タイプ"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "デバイス・タイプ。現在、「cdrom」と「disk」がサポートされています。"
+
+msgid "Storage Pool"
+msgstr "ストレージ・プール"
+
+msgid "Storage pool which volume located in"
+msgstr "ボリュームが含まれているストレージ・プール"
+
+msgid "Storage Volume"
+msgstr "ストレージ・ボリューム"
+
+msgid "Storage volume to be attached"
+msgstr "接続されるストレージ・ボリューム"
+
+msgid "File Path"
+msgstr "ファイル・パス"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "サーバー内での CDROM の ISO ファイル・パス。"
+
+msgid "Attach"
+msgstr "接続"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。"
@@ -1598,6 +1613,9 @@ msgstr "ゲスト"
msgid "Templates"
msgstr "テンプレート"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "アプリケーション構成を取得できませんでした"
@@ -2123,21 +2141,6 @@ msgstr " はい"
msgid "No"
msgstr " いいえ"
-msgid "Add a Volume to Storage Pool"
-msgstr "ボリュームをストレージ・プールに追加"
-
-msgid "Fetch from remote URL"
-msgstr "リモート URL からフェッチ"
-
-msgid "Enter the remote URL here."
-msgstr "ここにリモート URL を入力します。"
-
-msgid "Upload a file"
-msgstr "ファイルのアップロード"
-
-msgid "Choose the file you want to upload."
-msgstr "アップロードしたいファイルを選択してください。"
-
msgid "Define a New Storage Pool"
msgstr "新規ストレージ・プールの定義"
@@ -2213,6 +2216,21 @@ msgstr "SCSI アダプター"
msgid "Please, wait..."
msgstr "お待ちください..."
+msgid "Add a Volume to Storage Pool"
+msgstr "ボリュームをストレージ・プールに追加"
+
+msgid "Fetch from remote URL"
+msgstr "リモート URL からフェッチ"
+
+msgid "Enter the remote URL here."
+msgstr "ここにリモート URL を入力します。"
+
+msgid "Upload a file"
+msgstr "ファイルのアップロード"
+
+msgid "Choose the file you want to upload."
+msgstr "アップロードしたいファイルを選択してください。"
+
msgid "Add Template"
msgstr "テンプレートの追加"
@@ -2413,3 +2431,9 @@ msgstr "割り振り"
msgid "No templates found."
msgstr "テンプレートが見つかりません。"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "仮想マシン %(name)s のアクセス・メタデータを取得できません。詳細: %(err)s"
diff --git a/po/kimchi.pot b/po/kimchi.pot
index 1179357..91a70f0 100755
--- a/po/kimchi.pot
+++ b/po/kimchi.pot
@@ -3,12 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -267,11 +266,6 @@ msgstr ""
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr ""
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
msgid "The guest console password must be a string."
msgstr ""
@@ -340,6 +334,22 @@ msgid "Error attaching memory device. Details: %(error)s"
msgstr ""
#, python-format
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -1271,6 +1281,12 @@ msgstr ""
msgid "Available system users and groups"
msgstr ""
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr ""
@@ -1313,67 +1329,67 @@ msgstr ""
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
+msgid "Start"
msgstr ""
-msgid "Device Type"
+msgid "Reset"
msgstr ""
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgid "Pause"
msgstr ""
-msgid "Storage Pool"
+msgid "Resume"
msgstr ""
-msgid "Storage pool which volume located in"
+msgid "Power Off"
msgstr ""
-msgid "Storage Volume"
+msgid "Actions"
msgstr ""
-msgid "Storage volume to be attached"
+msgid "Connect"
msgstr ""
-msgid "File Path"
+msgid "Clone"
msgstr ""
-msgid "The ISO file path in the server for CDROM."
+msgid "Edit"
msgstr ""
-msgid "Attach"
+msgid "Shut Down"
msgstr ""
-msgid "Start"
+msgid "Delete"
msgstr ""
-msgid "Reset"
+msgid "Add a Storage Device to VM"
msgstr ""
-msgid "Pause"
+msgid "Device Type"
msgstr ""
-msgid "Resume"
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
-msgid "Power Off"
+msgid "Storage Pool"
msgstr ""
-msgid "Actions"
+msgid "Storage pool which volume located in"
msgstr ""
-msgid "Connect"
+msgid "Storage Volume"
msgstr ""
-msgid "Clone"
+msgid "Storage volume to be attached"
msgstr ""
-msgid "Edit"
+msgid "File Path"
msgstr ""
-msgid "Shut Down"
+msgid "The ISO file path in the server for CDROM."
msgstr ""
-msgid "Delete"
+msgid "Attach"
msgstr ""
msgid "The username or password you entered is incorrect. Please try again."
@@ -1397,6 +1413,9 @@ msgstr ""
msgid "Templates"
msgstr ""
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr ""
@@ -1878,21 +1897,6 @@ msgstr ""
msgid "No"
msgstr ""
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr ""
@@ -1963,6 +1967,21 @@ msgstr ""
msgid "Please, wait..."
msgstr ""
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr ""
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 4504a4b..4421f46 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -281,13 +281,6 @@ msgstr "그룹 '%(groups)s'이(가) 없습니다."
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr "가상 머신 %(name)s을(를) 종료할 수 없습니다. 세부사항: %(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-"가상 머신 %(name)s의 액세스 권한 메타데이터를 가져올 수 없습니다. 세부사항: "
-"%(err)s"
-
msgid "The guest console password must be a string."
msgstr "게스트 콘솔 비밀번호는 문자열이어야 합니다."
@@ -362,6 +355,21 @@ msgstr ""
msgid "Error attaching memory device. Details: %(error)s"
msgstr "메모리 장치를 연결하는 중 오류가 발생했습니다. 세부사항: %(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1376,6 +1384,12 @@ msgstr "MAC 주소"
msgid "Available system users and groups"
msgstr "사용 가능한 시스템 사용자 및 그룹"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "선택한 시스템 사용자 및 그룹"
@@ -1418,36 +1432,6 @@ msgstr "취소"
msgid "revert"
msgstr "되돌리기"
-msgid "Add a Storage Device to VM"
-msgstr "스토리지 장치를 VM에 추가"
-
-msgid "Device Type"
-msgstr "장치 유형"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "장치 유형. 현재 \"cdrom\" 및 \"disk\"가 지원됩니다."
-
-msgid "Storage Pool"
-msgstr "스토리지 풀"
-
-msgid "Storage pool which volume located in"
-msgstr "볼륨이 위치한 스토리지 풀"
-
-msgid "Storage Volume"
-msgstr "스토리지 볼륨"
-
-msgid "Storage volume to be attached"
-msgstr "연결될 스토리지 볼륨"
-
-msgid "File Path"
-msgstr "파일 경로"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다."
-
-msgid "Attach"
-msgstr "연결"
-
msgid "Start"
msgstr "시작"
@@ -1481,6 +1465,36 @@ msgstr "종료"
msgid "Delete"
msgstr "삭제"
+msgid "Add a Storage Device to VM"
+msgstr "스토리지 장치를 VM에 추가"
+
+msgid "Device Type"
+msgstr "장치 유형"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "장치 유형. 현재 \"cdrom\" 및 \"disk\"가 지원됩니다."
+
+msgid "Storage Pool"
+msgstr "스토리지 풀"
+
+msgid "Storage pool which volume located in"
+msgstr "볼륨이 위치한 스토리지 풀"
+
+msgid "Storage Volume"
+msgstr "스토리지 볼륨"
+
+msgid "Storage volume to be attached"
+msgstr "연결될 스토리지 볼륨"
+
+msgid "File Path"
+msgstr "파일 경로"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다."
+
+msgid "Attach"
+msgstr "연결"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오."
@@ -1503,6 +1517,9 @@ msgstr "게스트"
msgid "Templates"
msgstr "템플리트"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "애플리케이션 구성을 가져오지 못했습니다."
@@ -2017,21 +2034,6 @@ msgstr "예"
msgid "No"
msgstr "아니오"
-msgid "Add a Volume to Storage Pool"
-msgstr "스토리지 풀에 볼륨 추가"
-
-msgid "Fetch from remote URL"
-msgstr "원격 URL에서 페치"
-
-msgid "Enter the remote URL here."
-msgstr "여기에 원격 URL을 입력하십시오."
-
-msgid "Upload a file"
-msgstr "파일 업로드"
-
-msgid "Choose the file you want to upload."
-msgstr "업로드할 파일을 선택하십시오."
-
msgid "Define a New Storage Pool"
msgstr "새 스토리지 풀 정의"
@@ -2105,6 +2107,21 @@ msgstr "SCSI 어댑터"
msgid "Please, wait..."
msgstr "잠시 기다려 주십시오."
+msgid "Add a Volume to Storage Pool"
+msgstr "스토리지 풀에 볼륨 추가"
+
+msgid "Fetch from remote URL"
+msgstr "원격 URL에서 페치"
+
+msgid "Enter the remote URL here."
+msgstr "여기에 원격 URL을 입력하십시오."
+
+msgid "Upload a file"
+msgstr "파일 업로드"
+
+msgid "Choose the file you want to upload."
+msgstr "업로드할 파일을 선택하십시오."
+
msgid "Add Template"
msgstr "템플리트 추가"
@@ -2305,3 +2322,10 @@ msgstr "할당"
msgid "No templates found."
msgstr "템플리트가 없습니다."
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "가상 머신 %(name)s의 액세스 권한 메타데이터를 가져올 수 없습니다. 세부사"
+#~ "항: %(err)s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 61ffe9e..0064985 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -295,13 +295,6 @@ msgstr "O(s) grupo(s) '%(groups)s' não existem"
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr "Não é possível encerrar a máquina virtual %(name)s. Detalhes: %(err)s "
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-"Não é possível obter metadados de acesso da máquina virtual %(name)s. "
-"Detalhes: %(err)s "
-
msgid "The guest console password must be a string."
msgstr "A senha do console do convidado deve ser uma sequência."
@@ -378,6 +371,21 @@ msgstr ""
msgid "Error attaching memory device. Details: %(error)s"
msgstr "Erro ao anexar dispositivo de memória. Detalhes: %(error)s "
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr "Não é possível ligar a VM '%(name)s' porque ela está em execução."
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1487,6 +1495,12 @@ msgstr "Endereço MAC"
msgid "Available system users and groups"
msgstr "Usuários e grupos do sistema disponível"
+msgid "Users"
+msgstr "Usuários"
+
+msgid "Groups"
+msgstr "Grupos"
+
msgid "Selected system users and groups"
msgstr "Usuários e grupos do sistema selecionado"
@@ -1529,37 +1543,6 @@ msgstr "Cancelar"
msgid "revert"
msgstr "reverter"
-msgid "Add a Storage Device to VM"
-msgstr "Incluir um Dispositivo de Armazenamento na VM"
-
-msgid "Device Type"
-msgstr "Tipo de Dispositivo"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr ""
-"O tipo de dispositivo. Atualmente, \"cdrom\" e \"disk\" são suportados."
-
-msgid "Storage Pool"
-msgstr "storage pool"
-
-msgid "Storage pool which volume located in"
-msgstr "Conjunto de armazenamentos no qual o volume está localizado"
-
-msgid "Storage Volume"
-msgstr "Volume de Armazenamento"
-
-msgid "Storage volume to be attached"
-msgstr "Volume de armazenamento a ser conectado"
-
-msgid "File Path"
-msgstr "Caminho do arquivo"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "O caminho do arquivo ISO no servidor para o CDROM."
-
-msgid "Attach"
-msgstr "Anexar"
-
msgid "Start"
msgstr "Iniciar"
@@ -1593,6 +1576,37 @@ msgstr "Encerrar"
msgid "Delete"
msgstr "Excluir"
+msgid "Add a Storage Device to VM"
+msgstr "Incluir um Dispositivo de Armazenamento na VM"
+
+msgid "Device Type"
+msgstr "Tipo de Dispositivo"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr ""
+"O tipo de dispositivo. Atualmente, \"cdrom\" e \"disk\" são suportados."
+
+msgid "Storage Pool"
+msgstr "storage pool"
+
+msgid "Storage pool which volume located in"
+msgstr "Conjunto de armazenamentos no qual o volume está localizado"
+
+msgid "Storage Volume"
+msgstr "Volume de Armazenamento"
+
+msgid "Storage volume to be attached"
+msgstr "Volume de armazenamento a ser conectado"
+
+msgid "File Path"
+msgstr "Caminho do arquivo"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "O caminho do arquivo ISO no servidor para o CDROM."
+
+msgid "Attach"
+msgstr "Anexar"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "O nome de usuário ou senha inserido está incorreto. Tente novamente."
@@ -1614,6 +1628,9 @@ msgstr "Máquinas Virtuais"
msgid "Templates"
msgstr "Modelos"
+msgid "Administration"
+msgstr "Administração"
+
msgid "Failed to get application configuration"
msgstr "Falha ao obter a configuração do aplicativo"
@@ -2144,21 +2161,6 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-msgid "Add a Volume to Storage Pool"
-msgstr "Incluir um volume no conjunto de armazenamentos"
-
-msgid "Fetch from remote URL"
-msgstr "Buscar a partir da URL remota"
-
-msgid "Enter the remote URL here."
-msgstr "Inserir a URL remota aqui."
-
-msgid "Upload a file"
-msgstr "Fazer upload de um arquivo"
-
-msgid "Choose the file you want to upload."
-msgstr "Escolher o arquivo do qual você deseja fazer upload."
-
msgid "Define a New Storage Pool"
msgstr "Definir um novo storage pool"
@@ -2235,6 +2237,21 @@ msgstr "Adaptador SCSI"
msgid "Please, wait..."
msgstr "Aguarde..."
+msgid "Add a Volume to Storage Pool"
+msgstr "Incluir um volume no conjunto de armazenamentos"
+
+msgid "Fetch from remote URL"
+msgstr "Buscar a partir da URL remota"
+
+msgid "Enter the remote URL here."
+msgstr "Inserir a URL remota aqui."
+
+msgid "Upload a file"
+msgstr "Fazer upload de um arquivo"
+
+msgid "Choose the file you want to upload."
+msgstr "Escolher o arquivo do qual você deseja fazer upload."
+
msgid "Add Template"
msgstr "Incluir modelo"
@@ -2435,3 +2452,10 @@ msgstr "Alocação"
msgid "No templates found."
msgstr "Nenhum modelo localizado."
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "Não é possível obter metadados de acesso da máquina virtual %(name)s. "
+#~ "Detalhes: %(err)s "
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 804ff61..1dc4421 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -286,13 +286,6 @@ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr ""
"Не удалось завершить работу виртуальной машины %(name)s. Сведения: %(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-"Не удалось получить доступ к метаданным виртуальной машины %(name)s. "
-"Сведения: %(err)s"
-
msgid "The guest console password must be a string."
msgstr "Пароль консоли гостевой системы должен быть строкой."
@@ -378,6 +371,21 @@ msgstr ""
msgid "Error attaching memory device. Details: %(error)s"
msgstr "Ошибка подключения устройства памяти. Сведения: %(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1421,6 +1429,12 @@ msgstr "MAC-адрес"
msgid "Available system users and groups"
msgstr "Доступные системные пользователи и группы"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "Выбранные системные пользователи и группы"
@@ -1463,36 +1477,6 @@ msgstr "Отмена"
msgid "revert"
msgstr "восстановить"
-msgid "Add a Storage Device to VM"
-msgstr "Добавить устройство хранения в VM"
-
-msgid "Device Type"
-msgstr "Тип устройства"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "Тип устройства. В данный момент поддерживается \"cdrom\" и \"disk\"."
-
-msgid "Storage Pool"
-msgstr "Пул памяти"
-
-msgid "Storage pool which volume located in"
-msgstr "Том пула памяти находится в"
-
-msgid "Storage Volume"
-msgstr "Том памяти"
-
-msgid "Storage volume to be attached"
-msgstr "Том подключен"
-
-msgid "File Path"
-msgstr "Путь к файлу"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Путь к файлу ISO для CDROM на сервере."
-
-msgid "Attach"
-msgstr "Подключить"
-
msgid "Start"
msgstr "Запустить"
@@ -1526,6 +1510,36 @@ msgstr "Завершить работу"
msgid "Delete"
msgstr "Удалить"
+msgid "Add a Storage Device to VM"
+msgstr "Добавить устройство хранения в VM"
+
+msgid "Device Type"
+msgstr "Тип устройства"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "Тип устройства. В данный момент поддерживается \"cdrom\" и \"disk\"."
+
+msgid "Storage Pool"
+msgstr "Пул памяти"
+
+msgid "Storage pool which volume located in"
+msgstr "Том пула памяти находится в"
+
+msgid "Storage Volume"
+msgstr "Том памяти"
+
+msgid "Storage volume to be attached"
+msgstr "Том подключен"
+
+msgid "File Path"
+msgstr "Путь к файлу"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Путь к файлу ISO для CDROM на сервере."
+
+msgid "Attach"
+msgstr "Подключить"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "Указано неверное имя пользователя или пароль. Введите еще раз."
@@ -1547,6 +1561,9 @@ msgstr "Гостевые системы"
msgid "Templates"
msgstr "Шаблоны"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "Не удалось получить конфигурацию приложения"
@@ -2069,21 +2086,6 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-msgid "Add a Volume to Storage Pool"
-msgstr "Добавить том в пул памяти"
-
-msgid "Fetch from remote URL"
-msgstr "Загрузить с удаленного URL"
-
-msgid "Enter the remote URL here."
-msgstr "Введите сюда удаленный URL."
-
-msgid "Upload a file"
-msgstr "Передать файл"
-
-msgid "Choose the file you want to upload."
-msgstr "Выберите файл для передачи."
-
msgid "Define a New Storage Pool"
msgstr "Создать пул памяти"
@@ -2156,6 +2158,21 @@ msgstr "Адаптер SCSI"
msgid "Please, wait..."
msgstr "Подождите..."
+msgid "Add a Volume to Storage Pool"
+msgstr "Добавить том в пул памяти"
+
+msgid "Fetch from remote URL"
+msgstr "Загрузить с удаленного URL"
+
+msgid "Enter the remote URL here."
+msgstr "Введите сюда удаленный URL."
+
+msgid "Upload a file"
+msgstr "Передать файл"
+
+msgid "Choose the file you want to upload."
+msgstr "Выберите файл для передачи."
+
msgid "Add Template"
msgstr "Добавить шаблон"
@@ -2356,3 +2373,10 @@ msgstr "Выделение"
msgid "No templates found."
msgstr "Не найдены шаблоны."
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "Не удалось получить доступ к метаданным виртуальной машины %(name)s. "
+#~ "Сведения: %(err)s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7d3723b..97ddf56 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -273,11 +273,6 @@ msgstr "组“%(groups)s”不存在"
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr "无法关闭虚拟机 %(name)s。详细信息：%(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr "无法访问虚拟机 %(name)s 的元数据。详细信息：%(err)s"
-
msgid "The guest console password must be a string."
msgstr "访客控制台密码必须是字符串。"
@@ -346,6 +341,21 @@ msgstr "主机的 Libvirt 版本不支持内存设备。Libvirt 必须 >= 1.2.14
msgid "Error attaching memory device. Details: %(error)s"
msgstr "连接内存设备时出错。详细信息：%(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1292,6 +1302,12 @@ msgstr "MAC 地址"
msgid "Available system users and groups"
msgstr "可用系统用户和组"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "所选系统用户和组"
@@ -1334,36 +1350,6 @@ msgstr "取消"
msgid "revert"
msgstr "还原"
-msgid "Add a Storage Device to VM"
-msgstr "将存储设备添加至 VM"
-
-msgid "Device Type"
-msgstr "设备类型"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "设备类型。当前支持“cdrom”和“disk”。"
-
-msgid "Storage Pool"
-msgstr "存储池"
-
-msgid "Storage pool which volume located in"
-msgstr "卷位于以下位置的存储池"
-
-msgid "Storage Volume"
-msgstr "存储卷"
-
-msgid "Storage volume to be attached"
-msgstr "要连接的存储卷"
-
-msgid "File Path"
-msgstr "文件路径"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM 服务器中的 ISO 文件。"
-
-msgid "Attach"
-msgstr "连接"
-
msgid "Start"
msgstr "启动"
@@ -1397,6 +1383,36 @@ msgstr "关闭"
msgid "Delete"
msgstr "删除"
+msgid "Add a Storage Device to VM"
+msgstr "将存储设备添加至 VM"
+
+msgid "Device Type"
+msgstr "设备类型"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "设备类型。当前支持“cdrom”和“disk”。"
+
+msgid "Storage Pool"
+msgstr "存储池"
+
+msgid "Storage pool which volume located in"
+msgstr "卷位于以下位置的存储池"
+
+msgid "Storage Volume"
+msgstr "存储卷"
+
+msgid "Storage volume to be attached"
+msgstr "要连接的存储卷"
+
+msgid "File Path"
+msgstr "文件路径"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "CDROM 服务器中的 ISO 文件。"
+
+msgid "Attach"
+msgstr "连接"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "您所输入的用户名或密码不正确。请重试。"
@@ -1418,6 +1434,9 @@ msgstr "访客"
msgid "Templates"
msgstr "模板"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "未能获取应用程序配置"
@@ -1909,21 +1928,6 @@ msgstr "是"
msgid "No"
msgstr "否"
-msgid "Add a Volume to Storage Pool"
-msgstr "将卷添加至存储池"
-
-msgid "Fetch from remote URL"
-msgstr "从远程 URL 中访存"
-
-msgid "Enter the remote URL here."
-msgstr "在此处输入远程 URL。"
-
-msgid "Upload a file"
-msgstr "上载文件"
-
-msgid "Choose the file you want to upload."
-msgstr "选择要上载的文件。"
-
msgid "Define a New Storage Pool"
msgstr "定义新存储池"
@@ -1994,6 +1998,21 @@ msgstr "SCSI 适配器"
msgid "Please, wait..."
msgstr "请稍等..."
+msgid "Add a Volume to Storage Pool"
+msgstr "将卷添加至存储池"
+
+msgid "Fetch from remote URL"
+msgstr "从远程 URL 中访存"
+
+msgid "Enter the remote URL here."
+msgstr "在此处输入远程 URL。"
+
+msgid "Upload a file"
+msgstr "上载文件"
+
+msgid "Choose the file you want to upload."
+msgstr "选择要上载的文件。"
+
msgid "Add Template"
msgstr "添加模板"
@@ -2194,3 +2213,8 @@ msgstr "分配"
msgid "No templates found."
msgstr "找不到任何模板。"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr "无法访问虚拟机 %(name)s 的元数据。详细信息：%(err)s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c772f99..e169167 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 09:52-0300\n"
+"POT-Creation-Date: 2015-09-10 10:00-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -85,9 +85,8 @@ msgstr "\"_passthrough\" 應該是 \"true\" 或 \"false\""
msgid "\"_passthrough_affected_by\" should be a device name string"
msgstr "\"_passthrough_affected_by\" 應該是裝置名稱字串"
-#, fuzzy
msgid "\"_available_only\" should be \"true\" or \"false\""
-msgstr "\"_passthrough\" 應該是 \"true\" 或 \"false\""
+msgstr ""
#, python-format
msgid "Error while getting block devices. Details: %(err)s"
@@ -274,11 +273,6 @@ msgstr "群組 '%(groups)s' 不存在"
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr "無法關閉虛擬機器 %(name)s。詳細資料：%(err)s"
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr "無法取得虛擬機器 %(name)s 的存取 meta 資料。詳細資料：%(err)s"
-
msgid "The guest console password must be a string."
msgstr "客體主控台密碼必須是字串。"
@@ -348,6 +342,21 @@ msgstr "主機的 libvirt 版本不支援記憶體裝置。Libvirt 必須大於
msgid "Error attaching memory device. Details: %(error)s"
msgstr "連接記憶體裝置時發生錯誤。詳細資料：%(error)s"
+msgid "Cannot start %(name)s. Virtual machine is already running."
+msgstr ""
+
+#, python-format
+msgid "Cannot power off %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot shutdown %(name)s. Virtual machine is shut off."
+msgstr ""
+
+#, python-format
+msgid "Cannot reset %(name)s. Virtual machine is already shut off."
+msgstr ""
+
#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
@@ -1293,6 +1302,12 @@ msgstr "MAC 位址"
msgid "Available system users and groups"
msgstr "可用的系統使用者及群組"
+msgid "Users"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
msgid "Selected system users and groups"
msgstr "選定的系統使用者及群組"
@@ -1335,36 +1350,6 @@ msgstr "取消 "
msgid "revert"
msgstr "回復"
-msgid "Add a Storage Device to VM"
-msgstr "將儲存裝置新增至 VM"
-
-msgid "Device Type"
-msgstr "裝置類型"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "裝置類型。目前支援 \"cdrom\" 和 \"disk\"。"
-
-msgid "Storage Pool"
-msgstr "儲存區"
-
-msgid "Storage pool which volume located in"
-msgstr "磁區所在的儲存區"
-
-msgid "Storage Volume"
-msgstr "儲存磁區"
-
-msgid "Storage volume to be attached"
-msgstr "要連接的儲存磁區"
-
-msgid "File Path"
-msgstr "檔案路徑"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM 的 ISO 檔案路徑在伺服器中。"
-
-msgid "Attach"
-msgstr "連接"
-
msgid "Start"
msgstr "開始"
@@ -1398,6 +1383,36 @@ msgstr "關閉"
msgid "Delete"
msgstr "刪除"
+msgid "Add a Storage Device to VM"
+msgstr "將儲存裝置新增至 VM"
+
+msgid "Device Type"
+msgstr "裝置類型"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "裝置類型。目前支援 \"cdrom\" 和 \"disk\"。"
+
+msgid "Storage Pool"
+msgstr "儲存區"
+
+msgid "Storage pool which volume located in"
+msgstr "磁區所在的儲存區"
+
+msgid "Storage Volume"
+msgstr "儲存磁區"
+
+msgid "Storage volume to be attached"
+msgstr "要連接的儲存磁區"
+
+msgid "File Path"
+msgstr "檔案路徑"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "CDROM 的 ISO 檔案路徑在伺服器中。"
+
+msgid "Attach"
+msgstr "連接"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "您輸入的使用者名稱或密碼不正確。請重試。"
@@ -1419,6 +1434,9 @@ msgstr "客體"
msgid "Templates"
msgstr "範本"
+msgid "Administration"
+msgstr ""
+
msgid "Failed to get application configuration"
msgstr "無法取得應用程式配置"
@@ -1911,21 +1929,6 @@ msgstr "是"
msgid "No"
msgstr "否"
-msgid "Add a Volume to Storage Pool"
-msgstr "將磁區新增至儲存區"
-
-msgid "Fetch from remote URL"
-msgstr "從遠端 URL 提取"
-
-msgid "Enter the remote URL here."
-msgstr "在這裡輸入遠端 URL。"
-
-msgid "Upload a file"
-msgstr "上傳檔案"
-
-msgid "Choose the file you want to upload."
-msgstr "選擇要上傳的檔案。"
-
msgid "Define a New Storage Pool"
msgstr "定義新的儲存區"
@@ -1996,6 +1999,21 @@ msgstr "SCSI 配接卡"
msgid "Please, wait..."
msgstr "請稍候..."
+msgid "Add a Volume to Storage Pool"
+msgstr "將磁區新增至儲存區"
+
+msgid "Fetch from remote URL"
+msgstr "從遠端 URL 提取"
+
+msgid "Enter the remote URL here."
+msgstr "在這裡輸入遠端 URL。"
+
+msgid "Upload a file"
+msgstr "上傳檔案"
+
+msgid "Choose the file you want to upload."
+msgstr "選擇要上傳的檔案。"
+
msgid "Add Template"
msgstr "新增範本"
@@ -2196,3 +2214,8 @@ msgstr "配置"
msgid "No templates found."
msgstr "找不到範本。"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: "
+#~ "%(err)s"
+#~ msgstr "無法取得虛擬機器 %(name)s 的存取 meta 資料。詳細資料：%(err)s"
diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl
index 389f3c5..a56d96c 100644
--- a/ui/pages/guest-edit.html.tmpl
+++ b/ui/pages/guest-edit.html.tmpl
@@ -122,8 +122,8 @@
<input type="text" id="permission-avail-searchBox">
<div class="body">
<div class="head">
- <div class="column column-user"><div class="item">Users</div></div>
- <div class="column column-group"><div class="item">Groups</div></div>
+ <div class="column column-user"><div class="item">$_("Users")</div></div>
+ <div class="column column-group"><div class="item">$_("Groups")</div></div>
</div>
<div id="permission-avail-users" class="column column-user"></div>
<div id="permission-avail-groups" class="column column-group"></div>
@@ -138,8 +138,8 @@
<input type="text" id="permission-sel-searchBox">
<div class="body">
<div class="head">
- <div class="column column-user"><div class="item">Users</div></div>
- <div class="column column-group"><div class="item">Groups</div></div>
+ <div class="column column-user"><div class="item">$_("Users")</div></div>
+ <div class="column column-group"><div class="item">$_("Groups")</div></div>
</div>
<div id="permission-sel-users" class="column column-user"></div>
<div id="permission-sel-groups" class="column column-group"></div>
--
2.1.0
8 years, 8 months
- 2
- 1
[PATCH] Update build process to include jquery.base64.js
by Aline Manera
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
configure.ac | 1 +
ui/Makefile.am | 2 +-
ui/base64/Makefile.am | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 ui/base64/Makefile.am
diff --git a/configure.ac b/configure.ac
index 0261b5f..9eee3c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,7 @@ AC_CONFIG_FILES([
plugins/sample/ui/js/Makefile
plugins/sample/ui/pages/Makefile
ui/Makefile
+ ui/base64/Makefile
ui/css/Makefile
ui/images/Makefile
ui/images/theme-default/Makefile
diff --git a/ui/Makefile.am b/ui/Makefile.am
index d541355..2209ada 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = css images js libs pages spice-html5
+SUBDIRS = base64 css images js libs pages spice-html5
uidir = $(datadir)/kimchi/ui
diff --git a/ui/base64/Makefile.am b/ui/base64/Makefile.am
new file mode 100644
index 0000000..6ce3ca8
--- /dev/null
+++ b/ui/base64/Makefile.am
@@ -0,0 +1,19 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2015
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+jquerybase64dir = $(datadir)/kimchi/ui/base64
+dist_jquerybase64_DATA = $(wildcard *.js) $(NULL)
--
2.1.0
8 years, 8 months
- 2
- 2
[WOK] List Widget specification
by Samuel Henrique De Oliveira Guimaraes
Hi team,
As we discussed on the chat today, I need help creating a widget for the new-ui while I'm still working on the current Grid widget for Hosts, Storage and Network tabs.
According to the new-ui design spec doc, in the Host tab, Debug Reports and Repositories panels shouldn't be presented as tables but as lists with each line having a drop-down button on the right instead of one on the top below the panel header:
[cid:image001.png@01D0E586.91066C40]
This is the current json response for Repositories:
[
{
"config":{
"gpgcheck":false,
"gpgkey":"file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch",
"metalink":"https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$...",
"mirrorlist":"",
"repo_name":"Fedora $releasever - $basearch"
},
"repo_id":"fedora",
"enabled":true,
"baseurl":""
}
]
And Debug Reports:
[
{
"time":"2015-08-31-15:13:10",
"name":"test2",
"uri":"plugins/kimchi/data/debugreports/test2.tar.xz"
},
{
"time":"2015-08-31-15:12:57",
"name":"test",
"uri":"plugins/kimchi/data/debugreports/test.tar.xz"
}
]
I've planned the following HTML output for this widget:
- A <i class="fa fa-power-off"></i> tag, empty when repository is not enabled;
- repo_id: Displays the repository name
- repo_name: Repository description
- Bootstrap modal button (don't worry about styles since I'm still customizing it)
Reference: http://plnkr.co/edit/SgQcpfu5b5vVXWD9imND?p=preview
For debug reports lists:
-name;
-time;
- Bootstrap modal button (don't worry about styles since I'm still customizing it)
It is very important that we keep the same model from kimchi.hosts.js by replacing only the current widget with the new one (example: repositoriesGrid = new kimchi.widget.Grid({ }); to repositoriesGrid = new kimchi.widget.List({ }); ).
I don't think it is necessary to fetch the whole branch and apply the patches to edit kimchi files, this can be done using www.jsfiddle.net<http://www.jsfiddle.net>, www.jsbin.com<http://www.jsbin.com> , http://plnkr.co/ or http://codepen.io/ (I suggest plnkr or jsfiddle since we can easily include jQuery, FonAwesome and Bootstrap from their CDN servers).
Thanks,
Samuel
8 years, 8 months
- 2
- 2
[PATCH 16/17] Ginger Base : base plugin ui/config, make and robot files
by chandra＠linux.vnet.ibm.com
From: chandrureddy <chandra(a)linux.vnet.ibm.com>
---
plugins/gingerbase/ui/Makefile.am | 20 ++++++++++++++++++++
plugins/gingerbase/ui/config/Makefile.am | 22 ++++++++++++++++++++++
plugins/gingerbase/ui/config/tab-ext.xml | 10 ++++++++++
plugins/gingerbase/ui/robots.txt | 2 ++
4 files changed, 54 insertions(+)
create mode 100644 plugins/gingerbase/ui/Makefile.am
create mode 100644 plugins/gingerbase/ui/config/Makefile.am
create mode 100644 plugins/gingerbase/ui/config/tab-ext.xml
create mode 100644 plugins/gingerbase/ui/robots.txt
diff --git a/plugins/gingerbase/ui/Makefile.am b/plugins/gingerbase/ui/Makefile.am
new file mode 100644
index 0000000..e9d7b94
--- /dev/null
+++ b/plugins/gingerbase/ui/Makefile.am
@@ -0,0 +1,20 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SUBDIRS = config css images js libs pages
+
+uidir = $(datadir)/wok/plugins/gingerbase/ui
diff --git a/plugins/gingerbase/ui/config/Makefile.am b/plugins/gingerbase/ui/config/Makefile.am
new file mode 100644
index 0000000..d750a99
--- /dev/null
+++ b/plugins/gingerbase/ui/config/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+xmldir = $(datadir)/wok/plugins/gingerbase/ui/config
+
+dist_xml_DATA = \
+ tab-ext.xml \
+ $(NULL)
diff --git a/plugins/gingerbase/ui/config/tab-ext.xml b/plugins/gingerbase/ui/config/tab-ext.xml
new file mode 100644
index 0000000..2d2d9bd
--- /dev/null
+++ b/plugins/gingerbase/ui/config/tab-ext.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tabs-ext>
+ <tab>
+ <access role="admin" mode="admin"/>
+ <access role="user" mode="none"/>
+
+ <title>Host</title>
+ <path>plugins/gingerbase/host.html</path>
+ </tab>
+</tabs-ext>
diff --git a/plugins/gingerbase/ui/robots.txt b/plugins/gingerbase/ui/robots.txt
new file mode 100644
index 0000000..1f53798
--- /dev/null
+++ b/plugins/gingerbase/ui/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
--
2.1.0
8 years, 8 months
- 3
- 2