March 2017 - Kimchi-devel - oVirt List Archives

[PATCH] Add apache configuration
by Cédric Bosdonnat 11 Apr '17

11 Apr '17

Provide an apache2 virtual host configuration in contrib. With this, the user can choose to use either nginx or apache as a proxy. The reason why the configuration has been added to contrib rather than src/apache2 to mimic the nginx config, is that there is no distro with the same apache2 config layout than others. Also add Wants and After for apache2 in the systemd unit file. Signed-off-by: Cédric Bosdonnat <cbosdonnat(a)suse.com> --- contrib/wok.conf.apache | 34 ++++++++++++++++++++++++++++++++++ contrib/wokd.service.systemd | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 contrib/wok.conf.apache diff --git a/contrib/wok.conf.apache b/contrib/wok.conf.apache new file mode 100644 index 00000000..c7e650ee --- /dev/null +++ b/contrib/wok.conf.apache @@ -0,0 +1,34 @@ +Listen 8001 +Listen 8000 + +<VirtualHost *:8001> + ErrorLog /var/log/apache2/error_log + TransferLog /var/log/apache2/access_log + + Timeout 600 + LimitRequestBody 4294967296 + + SSLEngine on + SSLCertificateFile /etc/wok/wok-cert.pem + SSLCertificateKeyFile /etc/wok/wok-key.pem + SSLOpenSSLConfCmd DHParameters /etc/wok/dhparams.pem + SSLSessionCacheTimeout 600 + + RewriteEngine On + RewriteCond %{HTTP:Upgrade} =websocket [NC] + RewriteRule /(.*) ws://localhost:64667/$1 [P,L] + + ProxyPass /websockify http://127.0.0.1:64667/websockify + ProxyPassReverse /websockify http://127.0.0.1:64667/websockify + + ProxyPass / http://127.0.0.1:8010/ + ProxyPassReverse / http://127.0.0.1:8010/ +</VirtualHost> + +<VirtualHost *:8000> + ErrorLog /var/log/apache2/error_log + TransferLog /var/log/apache2/access_log + + RewriteEngine On + RewriteRule ^/(.*)$ https://localhost:8001/$1 [R] +</VirtualHost> diff --git a/contrib/wokd.service.systemd b/contrib/wokd.service.systemd index 621be601..eba80a9d 100644 --- a/contrib/wokd.service.systemd +++ b/contrib/wokd.service.systemd @@ -3,6 +3,8 @@ Description=Wok - Webserver Originated from Kimchi Documentation=https://github.com/kimchi-project/wok/wiki Wants=nginx.service After=nginx.service +Wants=apache2.service +After=apache2.service [Service] Type=simple -- 2.12.0

3 3

[PATCH] [Wok] python-mock not listed as dependency
by Ramon Medeiros 11 Apr '17

11 Apr '17

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- docs/fedora-deps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index 29b477f..484f409 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -42,7 +42,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests rpmlint + $ sudo yum install pyflakes python-pep8 python-requests rpmlint python-mock # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 -- 2.9.3

2 2

Wok 2.4 and Kimchi 2.4 are now released!
by Aline Manera 04 Apr '17

04 Apr '17

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Wok 2.4* and *Kimchi 2.4*! Kimchi 2.4 depends on *Wok 2.4* and *Ginger Base 2.3*! So make sure to have both of them properly installed in your system. Among many features, Wok 2.4 release includes: ✔ Plugins management ✔ Block authentication request after too many failures ✔ Asynchronous UI notification using Websockets ✔ Bug fixes Kimchi 2.4 release includes: ✔ Initial s390x systems support ✔ Guest CPU hot plug and unplug ✔ Live migration over RDMA ✔ Live snapshot support ✔ Bug fixes We have worked hard to ensure that Wok and Kimchi run well on the most popular Linux distributions including: Fedora 25, Ubuntu 16.10, openSUSE LEAP 42.2, and CentOS 7. They use standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔ https://github.com/kimchi-project/wok/archive/2.4.0.tar.gz ✔ https://github.com/kimchi-project/kimchi/archive/2.4.0.tar.gz ✔ git clone -b stable-2.4.x --recursivehttps://github.com/kimchi-project/wok.git There are also some packages available for download at: ✔http://kimchi-project.github.io/wok/downloads/ ✔http://kimchi-project.github.io/kimchi/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

3 7

[PATCH v2] [Wok] python-mock not listed as dependency
by Ramon Medeiros 29 Mar '17

29 Mar '17

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: do it for all distros docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 1 + docs/ubuntu-deps.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index 29b477f..484f409 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -42,7 +42,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests rpmlint + $ sudo yum install pyflakes python-pep8 python-requests rpmlint python-mock # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index a6086da..eee39f9 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -31,3 +31,4 @@ Packages required for tests --------------------------- $ sudo zypper install python-pyflakes python-pep8 python-requests rpmlint + python-mock diff --git a/docs/ubuntu-deps.md b/docs/ubuntu-deps.md index cdffc59..3607998 100644 --- a/docs/ubuntu-deps.md +++ b/docs/ubuntu-deps.md @@ -30,4 +30,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo apt-get install pep8 pyflakes python-requests + $ sudo apt-get install pep8 pyflakes python-requests python-mock -- 2.9.3

3 2

[PATCH] [WoK] Bug fix #205: adding 'user-log.dita' help page
by dhbarboza82＠gmail.com 29 Mar '17

29 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Added a new help page 'user-log.dita' with User Log help information. Changed 'settings.dita' to reflect the contents of the Settings tab. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/pages/help/en_US/settings.dita | 10 ++++------ ui/pages/help/en_US/user-log.dita | 42 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 ui/pages/help/en_US/user-log.dita diff --git a/ui/pages/help/en_US/settings.dita b/ui/pages/help/en_US/settings.dita index bebac17..9144697 100644 --- a/ui/pages/help/en_US/settings.dita +++ b/ui/pages/help/en_US/settings.dita @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <title>Settings</title> <csbody> <dl><dlentry> -<dt>User Activity Log</dt> -<dd>This section displays user activity log of Wok and its plugins.</dd> -<dd>To get any specific log result, please use the 'Advanced Search' option. You can specify a particular application (such as wok, ginger, gingerbase, gingers390x, kimchi), an user, request type or even date range.</dd> -<dd>Select "Reset to Default" option to clear the search criteria.</dd> -<dd>Download: Use this option to download user activity log.</dd> +<dt>Plugins Management</dt> +<dd>This section displays the current plug-in status of WoK..</dd> +<dd>In the 'Status' column it is possible to enable or disable a specific plug-in. Enabling a plug-in will enable all its dependencies (example: enabling Kimchi will enable Gingerbase as well). Likewise, disabling a plug-in will disable all plug-ins that depends on the now disabled plug-in (example: disabling Gingerbase will disable Kimchi and Ginger).</dd> </dlentry> </dl><?Pub Caret 2101?> </csbody> diff --git a/ui/pages/help/en_US/user-log.dita b/ui/pages/help/en_US/user-log.dita new file mode 100644 index 0000000..a06136b --- /dev/null +++ b/ui/pages/help/en_US/user-log.dita @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" + "..\dtd\cshelp.dtd"> +<?Pub Sty _display FontColor="red"?> +<?Pub Inc?> + +<cshelp id="settings" xml:lang="en-us"> +<title>Activity Log</title> +<csbody> +<dl><dlentry> +<dt>User Activity Log</dt> +<dd>This section displays user activity log of Wok and its plugins.</dd> +<dd>To get any specific log result, please use the 'Advanced Search' option. You can specify a particular application (such as wok, ginger, gingerbase, gingers390x, kimchi), an user, request type or even date range.</dd> +<dd>Select "Reset to Default" option to clear the search criteria.</dd> +<dd>Download: Use this option to download user activity log.</dd> +</dlentry> +</dl><?Pub Caret 2101?> +</csbody> +</cshelp> +<?Pub *0000003732?> -- 2.9.3

2 1

[PATCH] [Kimchi] Bug fix: Set original VLAN device to network parameters to be updated
by Aline Manera 29 Mar '17

29 Mar '17

It is part of the #1087 fix Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/networks.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/model/networks.py b/model/networks.py index eb1590e..ce93bb1 100644 --- a/model/networks.py +++ b/model/networks.py @@ -532,6 +532,9 @@ class NetworkModel(object): if params.get('vlan_id') or params.get('interfaces'): raise InvalidParameter("KCHNET0032E") + # merge parameters + info.update(params) + # get target device if bridge was created by Kimchi if connection == 'bridge': iface = info['interfaces'][0] @@ -544,18 +547,13 @@ class NetworkModel(object): else: info['interfaces'] = original['interfaces'] = [port] - # merge parameters - info.update(params) - # delete original network self.delete(name) try: # create new network - network = self.collection.create(info) + return self.collection.create(info) except: # restore original network self.collection.create(original) raise - - return network -- 2.9.3

2 2

[PATCH] [Kimchi] Bug fix: Inform user there is no interface available when creating a network
by Aline Manera 29 Mar '17

29 Mar '17

When there is no interface available, the user will not be able to create some networks so inform that to user using the existing drop down menu instead of a label message fixed in the dialog (which was displayed even though for network not requiring an interface). Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network_add_main.js | 7 +++---- ui/pages/network-add.html.tmpl | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index e1fdf13..c990e89 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,9 +79,8 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail, bEdit) { if (!bEdit) { kimchi.enableBridgeOptions(false); } - $("#networkBriDisabledLabel").removeClass('hidden'); - } else { - $("#networkBriDisabledLabel").remove(); + $("#destinationList button").addClass("disabled"); + $("#networkDestinationID").attr("title", "No interface available"); } }; diff --git a/ui/pages/network-add.html.tmpl b/ui/pages/network-add.html.tmpl index 14373ff..47be6f3 100644 --- a/ui/pages/network-add.html.tmpl +++ b/ui/pages/network-add.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,11 +46,8 @@ <option value="bridge">$_("Bridged: Virtual machines are connected through a network bridge")</option> </select> </div> - <div id="networkBriDisabledLabel" class="form-group hidden"> - <p>$_("(No interfaces found)")</p> - </div> <div id="bridgedContent"> - <div class="form-group"> + <div id="destinationList" class="form-group"> <label for="networkDestinationID">$_("Destination"): </label> <select id="networkDestinationID" data-size="5" class="selectpicker col-md-12 col-lg-12 form-control" data-none-selected-text="$_('Select an Interface')"> </select> -- 2.9.3

2 2

[PATCH] [Kimchi] Bug fix 1119: Proper check NetworkManager is running when creating new network
by Aline Manera 29 Mar '17

29 Mar '17

It was relying on Capabilities to verify NetworkManager was running or not. But the Capabilities value is only updated on lookup() which was leading on a wrong assumption. To fix that, call FeatureTests function directly. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/networks.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/model/networks.py b/model/networks.py index eb1590e..b653b23 100644 --- a/model/networks.py +++ b/model/networks.py @@ -33,7 +33,7 @@ from wok.plugins.gingerbase.netinfo import get_vlan_device, is_bridge, is_vlan from wok.plugins.gingerbase.netinfo import ports from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.config import kimchiPaths -from wok.plugins.kimchi.model.config import CapabilitiesModel +from wok.plugins.kimchi.model.featuretests import FeatureTests from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml @@ -52,8 +52,6 @@ class NetworksModel(object): if self.conn.isQemuURI(): self._check_default_networks() - self.caps = CapabilitiesModel(**kargs) - def _check_default_networks(self): networks = list(set(tmpl_defaults.get('networks', []))) @@ -228,7 +226,7 @@ class NetworksModel(object): # connection == macvtap and iface is not bridge elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): # libvirt bridge creation will fail with NetworkManager enabled - if self.caps.nm_running: + if FeatureTests.is_nm_running(): raise InvalidParameter('KCHNET0027E') if 'vlan_id' in params: -- 2.9.3

1 1

[PATCH] [WoK] Removing sessionStorage call in wok.main.js
by dhbarboza82＠gmail.com 27 Mar '17

27 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> sessionStorage was being used in early versions of the websocket notifications implementation to avoid opening multiple connections, before the current single permanent connection approach was implemented. If the 'wokNotificationWebSocket' key existed in the sessionStorage, we skipped the opening of a new websocket. This patch removes the sessionStorage usage because it accomplishes nothing in current code. No verification is made using the created 'wokNotificationWebSocket' session key in the code. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 26dc723..411b05e 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -69,7 +69,6 @@ wok.startNotificationWebSocket = function () { } }; - sessionStorage.setItem('wokNotificationWebSocket', 'true'); var heartbeat = setInterval(function() { wok.notificationsWebSocket.send(window.btoa('heartbeat')); }, 30000); -- 2.9.3

2 1

[PATCH] [WoK] Bug fix #189: Forcing download of user log file
by dhbarboza82＠gmail.com 27 Mar '17

27 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> The error in staticfile() happens when the browser tries to open a recently created file in a separated tab/window but this file isn't declared in the cherry-py config with tools.staticfile.on, like '/favicon.ico' for example. A suitable solution to avoid the error is to force the browser to download the file instead of opening it. According to the Cherry-py docs: "Using "application/x-download" response content-type, you can tell a browser that a resource should be downloaded onto the user’s machine rather than displayed." This patch set the application type of all '.txt' files created under the /data/logs dir as 'application/x-download'. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/wok/config.py.in | 3 +++ tests/test_config.py.in | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 677d0ed..c2bcc28 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -202,6 +202,9 @@ class WokConfig(dict): '/data/logs': { 'tools.staticdir.on': True, 'tools.staticdir.dir': '%s/logs' % paths.state_dir, + 'tools.staticdir.content_types': { + 'txt': 'application/x-download' + }, 'tools.nocache.on': False, 'tools.wokauth.on': True, }, diff --git a/tests/test_config.py.in b/tests/test_config.py.in index 9b8c851..a4d65bb 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -84,6 +84,9 @@ class ConfigTests(unittest.TestCase): '/data/logs': { 'tools.staticdir.on': True, 'tools.staticdir.dir': '%s/logs' % paths.state_dir, + 'tools.staticdir.content_types': { + 'txt': 'application/x-download' + }, 'tools.nocache.on': False, 'tools.wokauth.on': True, }, -- 2.9.3

2 1

[PATCH] [Kimchi] Bug fix: Display full Volume dropdown menu content even when pool has few volumes
by Aline Manera 27 Mar '17

27 Mar '17

When the storage pool has one or two storage volumes, the dropdown menu would not display all the options as the height set to it was not enough. To avoid that, increase the min-height configuration. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 6 +++++- ui/css/src/modules/_storage.scss | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 0af9293..2d44919 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2514,11 +2514,15 @@ ul { #storage-root-container .volumes .volumeslist { padding: 22px; - min-height: 136px; + min-height: 188px; max-height: 505px; overflow: hidden; } +#storage-root-container .volumes .volumeslist .wok-list { + min-height: inherit; +} + #storage-root-container .volumes .volumeslist .row { font-size: 0; margin-bottom: 22px; diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss index 70cb3fa..c8b84a9 100644 --- a/ui/css/src/modules/_storage.scss +++ b/ui/css/src/modules/_storage.scss @@ -82,11 +82,15 @@ .volumeslist { padding: 22px; - min-height: 136px; + min-height: 188px; max-height: 505px; overflow: hidden; } + .volumeslist .wok-list { + min-height: inherit; + } + .volumeslist .row { font-size: 0; margin-bottom: 22px; -- 2.9.3

2 2

[PATCH] [Kimchi] Bug fix: Proper display storage volume content on gallery view
by Aline Manera 27 Mar '17

27 Mar '17

On Storage volume gallery view, the volume box content was a mess. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 10 +++++----- ui/css/src/modules/_storage.scss | 10 +++++----- ui/pages/tabs/storage.html.tmpl | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 2d44919..948b888 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2683,7 +2683,7 @@ ul { #storage-root-container .volumes .wok-gallery .volume-box-inner { padding: 0 16px; width: 409px; - height: 150px; + height: auto; display: flex; flex-flow: row wrap; justify-content: space-around; @@ -2745,8 +2745,8 @@ ul { #storage-root-container .volumes .wok-gallery span.column-format, #storage-root-container .volumes .wok-gallery span.column-type { order: 3; - width: 142px; - margin-top: -5px; + width: auto; + margin: 5px 0px; } #storage-root-container .volumes .wok-gallery span.gallery-header { @@ -2937,14 +2937,14 @@ ul { @media (min-width: 992px) { #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-header > span.column-name, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-name { - width: 250px; + width: 450px; } } @media (min-width: 1200px) { #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-header > span.column-name, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-name { - width: 300px; + width: 500px; } } diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss index 0123009..cf81d1b 100644 --- a/ui/css/src/modules/_storage.scss +++ b/ui/css/src/modules/_storage.scss @@ -240,7 +240,7 @@ .volume-box-inner { padding: 0 16px; width: 409px; - height: 150px; + height: auto; display: flex; flex-flow: row wrap; justify-content: space-around; @@ -303,8 +303,8 @@ span.column-format, span.column-type { order: 3; - width: 142px; - margin-top: -5px; + width: auto; + margin: 5px 0px; } span.gallery-header { @@ -457,10 +457,10 @@ > span.column-name { width: 202px; @media (min-width: $screen-md) { - width: 250px; + width: 450px; } @media (min-width: $screen-lg) { - width: 300px; + width: 500px; } label { diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 9675579..ad88b65 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -172,10 +172,10 @@ <input type="checkbox" class="wok-checkbox" name="selected-volume[]" id="{checkbox}" value="{name}"> <label class="volume-name volume-name-filter" for="{checkbox}"><span class="volume-inline-progress hidden"><span class="wok-loading-icon"></span></span> {name}</label></span><span class="column-used"><span role="presentation" class="volume-icon {capacityIcon}"></span> {capacityLevel}%</span><span class="column-used-by volume-used-by-filter"><i class="fa fa-exclamation-circle" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}"></i><span class="format-text" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}">{used_by_text}</span></span><span class="column-format volume-format-filter"><span class="gallery-header" title="$_('Format')">$_('Format')</span><span class="format-text">{format}</span></span><span class="column-type volume-type-filter"><span class="gallery-header" title="$_('Type')">$_('Type')</span>{type}</span><span class="column-used-by volume-used-by-filter"><i class="fa fa-exclamation-circle" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}"></i><span class="format-text" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}">{used_by_text}</span></span><span class="column-used"><span role="presentation" class="volume-icon {capacityIcon}"></span> {capacityLevel}%</span><span class="column-allocated"><span class="gallery-header" title="$_('Allocation')">$_('Allocation')</span>{allocation}</span><span class="column-capacity"><span class="gallery-header" title="$_('Capacity')">$_('Capacity')</span>{capacity}</span><span class="column-progress hidden"><span class="progress-status"></span> <span class="progress-transferred"></span> -- 2.9.3

2 3

[PATCH] [Kimchi] Bug fix #1123: Do not rely on Wok configuration to get host information
by Aline Manera 22 Mar '17

22 Mar '17

The host information is only part of nginx configuration. So get the information of the running system to configure federation feature over openSLP Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/peers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/peers.py b/model/peers.py index 1be606b..c0dccce 100644 --- a/model/peers.py +++ b/model/peers.py @@ -34,7 +34,7 @@ class PeersModel(object): return # register server on openslp - hostname = socket.getfqdn(wok_config.get("server", "host")) + hostname = socket.getfqdn() port = wok_config.get("server", "proxy_port") self.url = hostname + ":" + port -- 2.9.3

2 2

[PATCH] [Kimchi] Bug fix: Preserve "View Gallery" button location when opening Storage Volume actions menu
by Aline Manera 22 Mar '17

22 Mar '17

The "View Gallery" button was being moved to left when opening the Storage Volume actions drop down menu. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index bfde50c..0429456 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. @@ -640,11 +640,6 @@ kimchi.doListVolumes = function(poolObj) { $('.pool-action', volumeDiv).on('show.bs.dropdown', function () { $(volumeDiv).scrollTop(0); - $(this).css('position','absolute'); - $('.toggle-gallery',volumeDiv).css({ - 'position':'absolute', - 'margin-top': '1px' - }); $(volumeDiv).bind('mousewheel DOMMouseScroll', function(e) { e.preventDefault(); }); -- 2.9.3

2 2

[PATCH v5] [Kimchi 0/4] Bug fix #1091: Allow to set disk performance options per guest and template
by Ramon Medeiros 21 Mar '17

21 Mar '17

Changes: v5: Increase commit message verbosity Always return cache and io Improve documentation at API.md v4: Add support for templates (creation and update) v3: Add docs v2: Use REST API for tests General fixes Ramon Medeiros (4): Read io and cache option from disks Allow disks to update cache and io flags Bug fix #1091: Allow to set disk performance options per guest and template Add tests to verify if cache and io of a disk can be changed API.json | 26 ++++++++++++++++++- docs/API.md | 12 +++++++++ i18n.py | 1 - model/vmstorages.py | 55 ++++++++++++++++++++++++++-------------- tests/test_rest.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++- vmtemplate.py | 19 +++++++++++++- xmlutils/disk.py | 14 ++++++++++- 7 files changed, 175 insertions(+), 24 deletions(-) -- 2.9.3

1 4

[PATCH v4 0/4] Bug fix #1091: Allow to set disk performance options per guest and template
by Ramon Medeiros 21 Mar '17

21 Mar '17

Changes: v4: Add support for templates (creation and update) v3: Add docs v2: Use REST API for tests General fixes Ramon Medeiros (4): Read io and cache option from disks Allow disks to update cache and io flags Bug fix #1091: Allow to set disk performance options per guest and template Add tests to verify if cache and io of a disk can be changed API.json | 26 ++++++++++++++++++++++++- docs/API.md | 4 ++++ i18n.py | 1 - model/vmstorages.py | 55 ++++++++++++++++++++++++++++++++++------------------ tests/test_rest.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++- vmtemplate.py | 19 +++++++++++++++++- xmlutils/disk.py | 23 ++++++++++++++++++++-- 7 files changed, 159 insertions(+), 25 deletions(-) -- 2.9.3

2 9

Cleaning up Datastore errors?
by wk 21 Mar '17

21 Mar '17

Heh, originally sent to -users but evidently noone looks at that. -------------- Our kimchi hosts have people constantly working on from the command line including changing qcow2 image names (our practice is to name them similar to the instance name so its easy to see whats up in /var/lib/libvirt/images) So after a while the wok error log is full of these messages. and we often get reoccuring pink error messages in the WebUI. Is there a way to cleanout/fix/ignore the datastore for those of use who also work directly with libvirt. -bill WOKOBJST0001E: Unable to find 5f48fb31-0d73-4df7-948c-02beefee83d1 in datastore WOKOBJST0001E: Unable to find c7d94dcb-185f-4917-9b2e-d304f5ce807b in datastore WOKOBJST0001E: Unable to find d7f82fc8-44dd-484f-aaf9-f4ed0de3efe3 in datastore WOKOBJST0001E: Unable to find f88269b8-8ca9-4689-b8aa-c7e720e3c396 in datastore WOKOBJST0001E: Unable to find b46491f9-4351-4b82-ad57-87568dd55f3e in datastore WOKOBJST0001E: Unable to find 7c34a9fd-b3b6-4894-a6f1-baf6b7099403 in datastore WOKOBJST0001E: Unable to find 0eb316fe-803c-4b25-9dae-522c02748e5c in datastore WOKOBJST0001E: Unable to find 4e5663b8-300d-4ad0-8959-ecdc489e8c71 in datastore WOKOBJST0001E: Unable to find 5f48fb31-0d73-4df7-948c-02beefee83d1 in datastore WOKOBJST0001E: Unable to find c7d94dcb-185f-4917-9b2e-d304f5ce807b in datastore

3 2

[PATCH] python-mock not listed as dependency
by Ramon Medeiros 16 Mar '17

16 Mar '17

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- docs/fedora-deps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index 29b477f..484f409 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -42,7 +42,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests rpmlint + $ sudo yum install pyflakes python-pep8 python-requests rpmlint python-mock # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 -- 2.9.3

1 1

[PATCH] [Wok] Bug fix #207: Fix LDAPUser class initialization
by Aline Manera 15 Mar '17

15 Mar '17

It was wrongly calling PAMUser instance on LDAPUser class initialization. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wok/auth.py b/src/wok/auth.py index 976d729..0ad1893 100644 --- a/src/wok/auth.py +++ b/src/wok/auth.py @@ -192,7 +192,7 @@ class LDAPUser(User): auth_type = "ldap" def __init__(self, username): - super(PAMUser, self).__init__(username) + super(LDAPUser, self).__init__(username) @staticmethod def authenticate(username, password): -- 2.9.3

2 2

[PATCH] [Kimchi] Bug fix #1107: Only set cache=none to disks that support direct IO
by Aline Manera 13 Mar '17

13 Mar '17

ZFS volumes and GlusterFS does not support direct IO and setting cache=none will not allow the guest to start. So only set cache=none when direct IO is supported to avoid problems. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- xmlutils/disk.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/xmlutils/disk.py b/xmlutils/disk.py index 02d6811..97298c5 100644 --- a/xmlutils/disk.py +++ b/xmlutils/disk.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,6 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import errno import lxml.etree as ET import os import socket @@ -28,7 +29,7 @@ from lxml.builder import E from wok.exception import InvalidParameter, NotFoundError from wok.plugins.kimchi.utils import check_url_path - +from wok.utils import wok_log BUS_TO_DEV_MAP = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'} DEV_TYPE_SRC_ATTR_MAP = {'file': 'file', 'block': 'dev'} @@ -51,11 +52,22 @@ def get_disk_xml(params): disk_type = _get_disk_type(path) if len(path) > 0 else 'file' disk = E.disk(type=disk_type, device=params['type']) driver = E.driver(name='qemu', type=params['format']) - if params['type'] != 'cdrom': - driver.set('cache', 'none') + try: + fd = os.open(path, os.O_RDONLY | os.O_DIRECT) + os.close(fd) + wok_log.debug("Disk '%s' supports direct I/O. Setting cache=none" + "to enable live migration" % path) + except OSError, e: + if e.errno == errno.EINVAL: + wok_log.debug("Disk '%s' does not support direct I/O: " + "'%s'. Let libvirt sets the default cache mode." % + (path, e.message)) + else: + if params['type'] != 'cdrom': + driver.set('cache', 'none') - if params.get('pool_type') == "netfs": - driver.set("io", "native") + if params.get('pool_type') == "netfs": + driver.set("io", "native") disk.append(driver) -- 2.9.3

2 2

[PATCH] [Kimchi 0/2] Run wok tests without administration permissions
by Lucio Correia 13 Mar '17

13 Mar '17

Lucio Correia (2): Fix tests to run without proxy Remove test for HTTP error 413 tests/test_model_storagevolume.py | 24 ++---------------------- tests/test_rest.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 30 deletions(-) -- 2.7.4

3 6

[PATCH v3] [Kimchi] Remove websocket initialization from Kimchi
by dhbarboza82＠gmail.com 13 Mar '17

13 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v3: - changed tearDown() to tearDownModule() in test_mockmodel.py v2: - removed websockify references from docs and build files. *** ATTENTION: REQUIRES '[WoK] Asynchronous UI notification implementation' PATCH *** Daniel Henrique Barboza (1): Use Websocket facilities from WoK contrib/DEBIAN/control.in | 1 - contrib/kimchi.spec.fedora.in | 1 - contrib/kimchi.spec.suse.in | 1 - docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 3 +- docs/ubuntu-deps.md | 2 +- model/vms.py | 2 +- root.py | 4 +- tests/test_mockmodel.py | 2 +- websocket.py | 121 ------------------------------------------ 10 files changed, 6 insertions(+), 133 deletions(-) delete mode 100644 websocket.py -- 2.9.3

2 3

[PATCH] [Kimchi 0/8] Run test_model with regular user
by Lucio Correia 11 Mar '17

11 Mar '17

Lucio Correia (8): Do not hardcode default directories Always use /var/tmp to store test files Mock default storage pools and networks for testing Use "qemu:///session" as test_model libvirt uri Remove 'run as root' requirement from some tests Skip tests that need to run as root Make test_use_test_host architecture independent Mock user probe functions model/storagepools.py | 5 +- osinfo.py | 12 +- tests/test_model.py | 407 +++++++++++++++++++++++++++++++++++++------------- 3 files changed, 321 insertions(+), 103 deletions(-) -- 2.7.4

1 8

[PATCH v4] [WoK] Asynchronous UI notification implementation
by dhbarboza82＠gmail.com 10 Mar '17

10 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v4: - server_loop with the socket listen was daemonized v3: - changed listener registration to be message specific instead of generic. v2: - Simplified UI code. Using now an array instead of a hashmap to prevent the need of inserting a listener identifier; - Changed the push server initialization. Moved it to server.py to avoid execution in the unit tests, but allow execution in the test mode. Do the same treatment with the ws_proxy initialization; - Socket file was moved to /run/user/<user_id>/woknotifications - Inserted notifications in base model level. Put code in base WoK classes to allow notifications for every model event without the need of adding it manually; - Standardization of messages sent. Messages are being sent in the pattern METHOD:plugin/entity/action; - Minor code fixes (imports, remove kimchi references); - Added websockify as a WoK runtime dependency. See patch commit message for more information. Daniel Henrique Barboza (1): Asynchronous UI notification implementation contrib/DEBIAN/control.in | 1 + contrib/wok.spec.fedora.in | 1 + contrib/wok.spec.suse.in | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 3 +- docs/ubuntu-deps.md | 3 +- src/wok/config.py.in | 8 ++ src/wok/control/base.py | 16 ++-- src/wok/model/notifications.py | 2 +- src/wok/pushserver.py | 164 +++++++++++++++++++++++++++++++++++++++++ src/wok/reqlogger.py | 11 ++- src/wok/root.py | 3 + src/wok/server.py | 13 +++- src/wok/websocket.py | 123 +++++++++++++++++++++++++++++++ ui/js/src/wok.main.js | 54 ++++++++++++++ ui/js/wok.user-log.js | 4 + 16 files changed, 395 insertions(+), 14 deletions(-) create mode 100644 src/wok/pushserver.py create mode 100644 src/wok/websocket.py -- 2.9.3

2 2

[PATCH] [Kimchi] Use Websocket facilities from WoK
by dhbarboza82＠gmail.com 10 Mar '17

10 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> *** ATTENTION: REQUIRES '[WoK] Asynchronous UI notification implementation' PATCH *** Daniel Henrique Barboza (1): Use Websocket facilities from WoK model/vms.py | 2 +- root.py | 4 +- websocket.py | 121 ----------------------------------------------------------- 3 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 websocket.py -- 2.9.3

4 4

[PATCH v2] [Kimchi] Remove websocket initialization from Kimchi
by dhbarboza82＠gmail.com 10 Mar '17

10 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - removed websockify references from docs and build files. *** ATTENTION: REQUIRES '[WoK] Asynchronous UI notification implementation' PATCH *** Daniel Henrique Barboza (1): Use Websocket facilities from WoK contrib/DEBIAN/control.in | 1 - contrib/kimchi.spec.fedora.in | 1 - contrib/kimchi.spec.suse.in | 1 - docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 3 +- docs/ubuntu-deps.md | 2 +- model/vms.py | 2 +- root.py | 4 +- websocket.py | 121 ------------------------------------------ 9 files changed, 5 insertions(+), 132 deletions(-) delete mode 100644 websocket.py -- 2.9.3

1 1

[PATCH v3] [WoK] Asynchronous UI notification implementation
by dhbarboza82＠gmail.com 10 Mar '17

10 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v3: - changed listener registration to be message specific instead of generic. v2: - Simplified UI code. Using now an array instead of a hashmap to prevent the need of inserting a listener identifier; - Changed the push server initialization. Moved it to server.py to avoid execution in the unit tests, but allow execution in the test mode. Do the same treatment with the ws_proxy initialization; - Socket file was moved to /run/user/<user_id>/woknotifications - Inserted notifications in base model level. Put code in base WoK classes to allow notifications for every model event without the need of adding it manually; - Standardization of messages sent. Messages are being sent in the pattern METHOD:plugin/entity/action; - Minor code fixes (imports, remove kimchi references); - Added websockify as a WoK runtime dependency. See patch commit message for more information. Daniel Henrique Barboza (1): Asynchronous UI notification implementation contrib/DEBIAN/control.in | 1 + contrib/wok.spec.fedora.in | 1 + contrib/wok.spec.suse.in | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 3 +- docs/ubuntu-deps.md | 3 +- src/wok/config.py.in | 8 ++ src/wok/control/base.py | 16 ++-- src/wok/model/notifications.py | 2 +- src/wok/pushserver.py | 163 +++++++++++++++++++++++++++++++++++++++++ src/wok/reqlogger.py | 11 ++- src/wok/root.py | 3 + src/wok/server.py | 13 +++- src/wok/websocket.py | 123 +++++++++++++++++++++++++++++++ ui/js/src/wok.main.js | 54 ++++++++++++++ ui/js/wok.user-log.js | 4 + 16 files changed, 394 insertions(+), 14 deletions(-) create mode 100644 src/wok/pushserver.py create mode 100644 src/wok/websocket.py -- 2.9.3

1 1

[PATCH v2] [WoK] Asynchronous UI notification implementation
by dhbarboza82＠gmail.com 10 Mar '17

10 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - Simplified UI code. Using now an array instead of a hashmap to prevent the need of inserting a listener identifier; - Changed the push server initialization. Moved it to server.py to avoid execution in the unit tests, but allow execution in the test mode. Do the same treatment with the ws_proxy initialization; - Socket file was moved to /run/user/<user_id>/woknotifications - Inserted notifications in base model level. Put code in base WoK classes to allow notifications for every model event without the need of adding it manually; - Standardization of messages sent. Messages are being sent in the pattern METHOD:plugin/entity/action; - Minor code fixes (imports, remove kimchi references); - Added websockify as a WoK runtime dependency. See patch commit message for more information. Daniel Henrique Barboza (1): Asynchronous UI notification implementation contrib/DEBIAN/control.in | 1 + contrib/wok.spec.fedora.in | 1 + contrib/wok.spec.suse.in | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 3 +- docs/ubuntu-deps.md | 3 +- src/wok/config.py.in | 8 ++ src/wok/control/base.py | 16 ++-- src/wok/model/notifications.py | 2 +- src/wok/pushserver.py | 163 +++++++++++++++++++++++++++++++++++++++++ src/wok/reqlogger.py | 11 ++- src/wok/root.py | 3 + src/wok/server.py | 13 +++- src/wok/websocket.py | 123 +++++++++++++++++++++++++++++++ ui/js/src/wok.main.js | 43 +++++++++++ ui/js/wok.user-log.js | 12 +++ 16 files changed, 391 insertions(+), 14 deletions(-) create mode 100644 src/wok/pushserver.py create mode 100644 src/wok/websocket.py -- 2.9.3

3 5

[PATCH v3] [Kimchi 0/4] Bug fix #1091: Allow to set disk performance options per guest and template
by Ramon Medeiros 09 Mar '17

09 Mar '17

Changes: v3: Add docs v2: Use REST API for tests General fixes Ramon Medeiros (4): Read io and cache option from disks Allow disks to update cache and io flags Bug fix #1091: Allow to set disk performance options per guest and template Add tests to verify if cache and io of a disk can be changed API.json | 11 ++++++++++- docs/API.md | 4 ++++ i18n.py | 1 - model/vmstorages.py | 55 +++++++++++++++++++++++++++++++++++------------------ tests/test_rest.py | 28 +++++++++++++++++++++++++++ xmlutils/disk.py | 23 ++++++++++++++++++++-- 6 files changed, 99 insertions(+), 23 deletions(-) -- 2.9.3

1 4

[PATCH] [Kimchi 0/3] Bug fix #1091: Allow to set disk performance options per guest and template
by Ramon Medeiros 08 Mar '17

08 Mar '17

Changes: v2: Use REST API for tests General fixes Ramon Medeiros (3): Allow disks to update cache and io flags Bug fix #1091: Allow to set disk performance options per guest and template Add tests to verify if cache and io of a disk can be changed API.json | 11 ++++++++++- docs/API.md | 3 +++ i18n.py | 1 - model/vmstorages.py | 55 +++++++++++++++++++++++++++++++++++------------------ tests/test_rest.py | 28 +++++++++++++++++++++++++++ xmlutils/disk.py | 12 +++++++++++- 6 files changed, 88 insertions(+), 22 deletions(-) -- 2.9.3

1 3

Make Kimchi free of Ginger Base
by Aline Manera 07 Mar '17

07 Mar '17

Hi all! Ginger Base (responsible to launch the Dashboard and Updates tabs under Host tab) is a Kimchi dependency because some users may be want to check host configuration and statistics when running multiple virtual machines as long as update the Kimchi package without the need to drop to the host console. I agree it is useful, but I don't think it is restricted related to virtualization. So my proposal is to make Kimchi free of Ginger Base and if user wants any host information he/she can install Ginger Base alone. What do you think about it? It is not just remove the Ginger Base package dependency because Kimchi uses some python modules from Ginger Base. So if you agree, I will work to remove the Kimchi dependency on those Ginger Base python modules and then, remove the package dependency. Let me know your thoughts! Regards, Aline Manera

3 2

[PATCH] [Wok] Updated PO files
by rajgupta＠linux.vnet.ibm.com 07 Mar '17

07 Mar '17

From: Rajat Gupta <rajat.triumph(a)gmail.com> Updated PO files Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com> --- po/de_DE.po | 69 ++++++++++++++++++- po/en_US.po | 67 +++++++++++++++++- po/es_ES.po | 69 ++++++++++++++++++- po/fr_FR.po | 69 ++++++++++++++++++- po/it_IT.po | 69 ++++++++++++++++++- po/ja_JP.po | 203 +++++++++++++++++++++++++++++++++++-------------------- po/ko_KR.po | 69 ++++++++++++++++++- po/pt_BR.po | 69 ++++++++++++++++++- po/ru_RU.po | 69 ++++++++++++++++++- po/wok.pot | 67 +++++++++++++++++- po/zh_CN.po | 220 ++++++++++++++++++++++++++++++++++++++---------------------- po/zh_TW.po | 209 +++++++++++++++++++++++++++++++++++++-------------------- 12 files changed, 999 insertions(+), 250 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 32f221a..c15716d 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\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" @@ -65,14 +65,28 @@ msgstr "" msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "Geben Sie %(item)s an, um sich bei Wok anzumelden" #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "" +msgid "Specify password to login into Wok." +msgstr "Geben Sie %(item)s an, um sich bei Wok anzumelden" + +msgid "You need to specify username and password to login into Wok." +msgstr "Geben Sie %(item)s an, um sich bei Wok anzumelden" + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -107,6 +121,13 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -118,6 +139,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -129,6 +153,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "FEHLERCODE" @@ -163,6 +195,9 @@ msgstr "Abbrechen" msgid "Confirm" msgstr "Bestätigen" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "Wird geladen..." @@ -178,6 +213,12 @@ msgstr "Detaillierte Meldung:" msgid "Max:" msgstr "Max:" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -220,6 +261,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -280,6 +331,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/en_US.po b/po/en_US.po index d4a21d2..3aa476f 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: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\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" @@ -64,14 +64,28 @@ msgstr "" msgid "You are not authorized to access Wok. Please, login first." msgstr "" +msgid "Specify username to login into Wok." +msgstr "" + #, python-format -msgid "Specify %(item)s to login into Wok." +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." msgstr "" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "" +msgid "Specify password to login into Wok." +msgstr "" + +msgid "You need to specify username and password to login into Wok." +msgstr "" + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -104,6 +118,13 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -115,6 +136,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -126,6 +150,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "" @@ -158,6 +190,9 @@ msgstr "" msgid "Confirm" msgstr "" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "" @@ -173,6 +208,12 @@ msgstr "" msgid "Max:" msgstr "" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -215,6 +256,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -275,6 +326,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 72a749e..3ef5263 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\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" @@ -65,14 +65,28 @@ msgstr "" msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "Especifique %(item)s para iniciar la sesión en Wok" #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "" +msgid "Specify password to login into Wok." +msgstr "Especifique %(item)s para iniciar la sesión en Wok" + +msgid "You need to specify username and password to login into Wok." +msgstr "Especifique %(item)s para iniciar la sesión en Wok" + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -107,6 +121,13 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -118,6 +139,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -129,6 +153,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERROR" @@ -164,6 +196,9 @@ msgstr "Cancelar" msgid "Confirm" msgstr "Confirmar" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "Cargando..." @@ -179,6 +214,12 @@ msgstr "Mensaje detallado:" msgid "Max:" msgstr "Máx.:" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -221,6 +262,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -281,6 +332,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/fr_FR.po b/po/fr_FR.po index 12bbba3..af92fe2 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\n" "PO-Revision-Date: 2014-08-27 21:30+0000\n" "Last-Translator: BobSynfig\n" "Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/" @@ -68,14 +68,28 @@ msgstr "" msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "Spécifiez %(item)s pour vous logguer dans Wok" #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "" +msgid "Specify password to login into Wok." +msgstr "Spécifiez %(item)s pour vous logguer dans Wok" + +msgid "You need to specify username and password to login into Wok." +msgstr "Spécifiez %(item)s pour vous logguer dans Wok" + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -110,6 +124,13 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -121,6 +142,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -132,6 +156,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "ERROR CODE" @@ -167,6 +199,9 @@ msgstr "Annuler" msgid "Confirm" msgstr "Confirmer" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "Chargement en cours..." @@ -182,6 +217,12 @@ msgstr "Message détaillé:" msgid "Max:" msgstr "Max:" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -224,6 +265,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -284,6 +335,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index 045bb81..fe3760e 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\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" @@ -65,14 +65,28 @@ msgstr "" msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "Specificare %(item)s per accedere a Wok." #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "" +msgid "Specify password to login into Wok." +msgstr "Specificare %(item)s per accedere a Wok." + +msgid "You need to specify username and password to login into Wok." +msgstr "Specificare %(item)s per accedere a Wok." + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -107,6 +121,13 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -118,6 +139,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -129,6 +153,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "CODICE DI ERRORE" @@ -164,6 +196,9 @@ msgstr "Annulla" msgid "Confirm" msgstr "Conferma" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "Caricamento in corso..." @@ -179,6 +214,12 @@ msgstr "Messaggio dettagliato:" msgid "Max:" msgstr "Massimo:" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -221,6 +262,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -281,6 +332,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/ja_JP.po b/po/ja_JP.po index ce3bb31..67b754f 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\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" @@ -18,7 +18,7 @@ msgstr "" #, python-format msgid "Delete is not allowed for %(resource)s" -msgstr "%(resource)s の削除は許可されません" +msgstr "%(resource)s に対して削除は許可されません" #, python-format msgid "%(resource)s does not implement update method" @@ -26,7 +26,7 @@ msgstr "%(resource)s は更新メソッドを実装していません" #, python-format msgid "Create is not allowed for %(resource)s" -msgstr "%(resource)s の作成は許可されません" +msgstr "%(resource)s に対して作成は許可されません" msgid "Unable to parse JSON request" msgstr "JSON 要求を解析できません" @@ -36,25 +36,25 @@ msgstr "この API は JSON のみサポートします" #, python-format msgid "Parameters does not match requirement in schema: %(err)s" -msgstr "" +msgstr "パラメーターがスキーマでの要件に適合しません: %(err)s" msgid "You don't have permission to perform this operation." -msgstr "" +msgstr "この操作を実行する権限がありません。" #, python-format msgid "Unable to find task id: %(id)s" -msgstr "" +msgstr "タスク ID %(id)s が見つかりません" msgid "There is no callback to execute the kill task process." -msgstr "" +msgstr "タスク強制終了プロセスを実行するコールバックがありません。" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "タスク %(task)s の実行中に %(seconds)s 秒のタイムアウトが満了しました。" #, python-format msgid "Unable to kill task due error: %(err)s" -msgstr "" +msgstr "エラーが発生したため、タスクを強制終了できません: %(err)s" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -64,68 +64,98 @@ msgstr "" msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "Wok にログインするには、%(item)s を指定します" #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "LDAP 構成が無効です: %(item)s : %(value)s" + +msgid "Specify password to login into Wok." +msgstr "Wok にログインするには、%(item)s を指定します" + +msgid "You need to specify username and password to login into Wok." +msgstr "Wok にログインするには、%(item)s を指定します" + +msgid "The username or password you entered is incorrect. Please try again" msgstr "" #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" -msgstr "" +msgstr "フィルター・パラメーターが無効です。許可されているフィルター・パラメーター: %(filters)s" #, python-format msgid "Creation of log file failed: %(err)s" -msgstr "" +msgstr "ログ・ファイルを作成できませんでした: %(err)s" #, python-format msgid "Unable to find notification %(id)s" -msgstr "" +msgstr "通知 %(id)s が見つかりません" #, python-format msgid "Unable to delete notification %(id)s: %(message)s" -msgstr "" +msgstr "通知 %(id)s を削除できません: %(message)s" #, python-format msgid "Unable to find %(item)s in datastore" -msgstr "%(item)s はデータ・ストアに見つかりません" +msgstr "%(item)s がデータ・ストアに見つかりません" #, python-format msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds" -msgstr "" -"コマンド「%(cmd)s」を実行していましたが、%(seconds)s 秒を経過してタイムアウト" -"になりました" +msgstr "「%(cmd)s」コマンドの実行中、%(seconds)s 秒後にタイムアウトになります" #, python-format msgid "Invalid data value '%(value)s'" -msgstr "" +msgstr "データ値「%(value)s」が無効です" #, python-format msgid "Invalid data unit '%(unit)s'" +msgstr "データ単位「%(unit)s」が無効です" + +msgid "WoK is going to restart. Existing WoK connections will be closed." msgstr "" #, python-format -msgid "Successfully completed task '%(target_uri)s'" +msgid "Unable to find plug-in %(name)s" msgstr "" #, python-format +msgid "Successfully completed task '%(target_uri)s'" +msgstr "タスク「%(target_uri)s」は正常に完了しました" + +#, python-format msgid "Failed to complete task '%(target_uri)s'" -msgstr "" +msgstr "タスク「%(target_uri)s」を完了できませんでした" msgid "Request made on collection" +msgstr "コレクションに関する要求がなされました" + +msgid "Wok reload" msgstr "" msgid "Request made on resource" -msgstr "" +msgstr "リソースに関する要求がなされました" #, python-format msgid "User '%(username)s' login" -msgstr "" +msgstr "ユーザー「%(username)s」ログイン" #, python-format msgid "User '%(username)s' logout" +msgstr "ユーザー「%(username)s」ログアウト" + +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." msgstr "" msgid "ERROR CODE" @@ -141,10 +171,10 @@ msgid "Go to Homepage" msgstr "ホーム・ページに移動する" msgid "Wok" -msgstr "" +msgstr "Wok" msgid "Settings" -msgstr "" +msgstr "設定" msgid "No such data available." msgstr "そのようなデータはありません。" @@ -152,9 +182,7 @@ msgstr "そのようなデータはありません。" msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " -msgstr "" -"ホスト・システムに接続できません。ホスト・システムが稼働していて、ネットワー" -"ク接続が行われていることを確認してください。HTTP 要求応答 %1" +msgstr "ホスト・システムに接続できません。ホスト・システムが稼働していること、およびそのホスト・システムにネットワーク接続されていることを確認してください。HTTP 要求応答 %1。" msgid "Cancel" msgstr "取消" @@ -162,11 +190,14 @@ msgstr "取消" msgid "Confirm" msgstr "確認" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." -msgstr "ロードしています..." +msgstr "ロード中..." msgid "An error occurred while retrieving system information." -msgstr "" +msgstr "システム情報の取得中にエラーが発生しました。" msgid "Retry" msgstr "再試行" @@ -177,80 +208,96 @@ msgstr "詳細メッセージ:" msgid "Max:" msgstr "最大:" -msgid "Application" +msgid "Session timeout, please re-login." msgstr "" -msgid "User" +msgid "Server unreachable" msgstr "" +msgid "Application" +msgstr "アプリケーション" + +msgid "User" +msgstr "ユーザー" + msgid "Request" -msgstr "" +msgstr "要求" msgid "Date" -msgstr "" +msgstr "日付" msgid "Time" -msgstr "" +msgstr "時間" msgid "Message" -msgstr "" +msgstr "メッセージ" msgid "Please wait..." -msgstr "" +msgstr "お待ちください..." msgid "Filter" -msgstr "" +msgstr "フィルター" msgid "Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries" -msgstr "" +msgstr "{{ctx.total}} 個の項目のうち {{ctx.start}} 個目から {{ctx.end}} 個目までを表示しています" msgid "No results found!" -msgstr "" +msgstr "結果が見つかりません。" msgid "Actions" -msgstr "" +msgstr "アクション" msgid "Zone" msgstr "" msgid "IP Address" -msgstr "" +msgstr "IP アドレス" msgid "Status" +msgstr "状況" + +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." msgstr "" -msgid "Your session will be expired on: %1 s. Do you want to renew it?" +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." msgstr "" +msgid "Your session will be expired on: %1 s. Do you want to renew it?" +msgstr "ご使用のセッションは %1 に有効期限が切れます。セッションを更新しますか?" + msgid "Ki" -msgstr "" +msgstr "Ki" msgid "Mi" -msgstr "" +msgstr "Mi" msgid "Gi" -msgstr "" +msgstr "Gi" msgid "Ti" -msgstr "" +msgstr "Ti" msgid "Pi" -msgstr "" +msgstr "Pi" msgid "k" -msgstr "" +msgstr "k" msgid "M" -msgstr "" +msgstr "M" msgid "G" -msgstr "" +msgstr "G" msgid "T" -msgstr "" +msgstr "T" msgid "P" -msgstr "" +msgstr "P" msgid "Log out" msgstr "ログアウト" @@ -262,58 +309,70 @@ msgid "About" msgstr "製品情報" msgid "Toggle navigation" -msgstr "" +msgstr "ナビゲーションの切り替え" msgid "Your session will expire on: 30s. Do you want to renew it?" -msgstr "" +msgstr "ご使用のセッションは 30 秒後に有効期限が切れます。セッションを更新しますか?" msgid "Renew" -msgstr "" +msgstr "更新" msgid "Dismiss" -msgstr "" +msgstr "却下" msgid "Powered by" -msgstr "" +msgstr "以下の技術が採用されています" msgid "Wok Version" +msgstr "Wok バージョン" + +msgid "Plugins Management" msgstr "" -msgid "User Activity Log" +msgid "Name" msgstr "" -msgid "Advanced Search" +msgid "Description" msgstr "" -msgid "Download" +msgid "No result found" msgstr "" +msgid "User Activity Log" +msgstr "ユーザー・アクティビティー・ログ" + +msgid "Advanced Search" +msgstr "拡張検索" + +msgid "Download" +msgstr "ダウンロード" + msgid "Refresh" -msgstr "" +msgstr "リフレッシュ" msgid "Search results by:" -msgstr "" +msgstr "検索結果の基準:" msgid "Request Type" -msgstr "" +msgstr "要求タイプ" msgid "All Requests" -msgstr "" +msgstr "すべての要求" msgid "POST" -msgstr "" +msgstr "POST" msgid "GET" -msgstr "" +msgstr "GET" msgid "PUT" -msgstr "" +msgstr "PUT" msgid "DELETE" -msgstr "" +msgstr "DELETE" msgid "User IP Address" -msgstr "" +msgstr "ユーザー IP アドレス" msgid "Search" -msgstr "" +msgstr "検索" diff --git a/po/ko_KR.po b/po/ko_KR.po index 8c08c57..9a1f80c 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\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" @@ -63,14 +63,28 @@ msgstr "사용자 '%(username)s'의 인증이 실패했습니다. [오류 코드 msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "Wok에 로그인하려면 %(item)s을(를) 지정하십시오." #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "" +msgid "Specify password to login into Wok." +msgstr "Wok에 로그인하려면 %(item)s을(를) 지정하십시오." + +msgid "You need to specify username and password to login into Wok." +msgstr "Wok에 로그인하려면 %(item)s을(를) 지정하십시오." + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -103,6 +117,13 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -114,6 +135,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -125,6 +149,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "오류 코드" @@ -159,6 +191,9 @@ msgstr "취소" msgid "Confirm" msgstr "확인" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "로드 중..." @@ -174,6 +209,12 @@ msgstr "세부 메시지:" msgid "Max:" msgstr "최대:" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -216,6 +257,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -276,6 +327,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8bc8d1a..bf865af 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\n" "PO-Revision-Date: 2015-03-23 12:57+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -82,14 +82,28 @@ msgstr "" msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "Especifique %(item)s para autenticar no Wok" #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "Configurações LDAP inválidas: %(item)s : %(value)s" +msgid "Specify password to login into Wok." +msgstr "Especifique %(item)s para autenticar no Wok" + +msgid "You need to specify username and password to login into Wok." +msgstr "Especifique %(item)s para autenticar no Wok" + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -123,6 +137,13 @@ msgstr "Valor inválido '%(value)s'" msgid "Invalid data unit '%(unit)s'" msgstr "Unidade inválida '%(unit)s'" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -134,6 +155,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -145,6 +169,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERRO" @@ -180,6 +212,9 @@ msgstr "Cancelar" msgid "Confirm" msgstr "Confirmar" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "Carregando..." @@ -195,6 +230,12 @@ msgstr "Mensagem detalhada:" msgid "Max:" msgstr "Máximo:" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -237,6 +278,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -297,6 +348,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 3a28074..e58458e 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\n" "PO-Revision-Date: 2014-08-28 17:32+0000\n" "Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/" @@ -64,14 +64,28 @@ msgstr "Сбой идентификации пользователя %(username) msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "Укажите %(item)s для входа в Wok" #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "" +msgid "Specify password to login into Wok." +msgstr "Укажите %(item)s для входа в Wok" + +msgid "You need to specify username and password to login into Wok." +msgstr "Укажите %(item)s для входа в Wok" + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -104,6 +118,13 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -115,6 +136,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -126,6 +150,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "Код ошибки" @@ -160,6 +192,9 @@ msgstr "Отмена" msgid "Confirm" msgstr "Подтвердить" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "Загружается..." @@ -175,6 +210,12 @@ msgstr "Подробное сообщение:" msgid "Max:" msgstr "Макс.:" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -217,6 +258,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -277,6 +328,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/wok.pot b/po/wok.pot index 67b9d76..e3cbc96 100755 --- a/po/wok.pot +++ b/po/wok.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\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" @@ -64,14 +64,28 @@ msgstr "" msgid "You are not authorized to access Wok. Please, login first." msgstr "" +msgid "Specify username to login into Wok." +msgstr "" + #, python-format -msgid "Specify %(item)s to login into Wok." +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." msgstr "" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" msgstr "" +msgid "Specify password to login into Wok." +msgstr "" + +msgid "You need to specify username and password to login into Wok." +msgstr "" + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" + #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" msgstr "" @@ -104,6 +118,13 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "WoK is going to restart. Existing WoK connections will be closed." +msgstr "" + +#, python-format +msgid "Unable to find plug-in %(name)s" +msgstr "" + #, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -115,6 +136,9 @@ msgstr "" msgid "Request made on collection" msgstr "" +msgid "Wok reload" +msgstr "" + msgid "Request made on resource" msgstr "" @@ -126,6 +150,14 @@ msgstr "" msgid "User '%(username)s' logout" msgstr "" +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." +msgstr "" + msgid "ERROR CODE" msgstr "" @@ -158,6 +190,9 @@ msgstr "" msgid "Confirm" msgstr "" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." msgstr "" @@ -173,6 +208,12 @@ msgstr "" msgid "Max:" msgstr "" +msgid "Session timeout, please re-login." +msgstr "" + +msgid "Server unreachable" +msgstr "" + msgid "Application" msgstr "" @@ -215,6 +256,16 @@ msgstr "" msgid "Status" msgstr "" +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." +msgstr "" + +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." +msgstr "" + msgid "Your session will be expired on: %1 s. Do you want to renew it?" msgstr "" @@ -275,6 +326,18 @@ msgstr "" msgid "Wok Version" msgstr "" +msgid "Plugins Management" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "No result found" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index ade155b..d2eff4f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -35,139 +35,170 @@ msgstr "" #, python-format msgid "Delete is not allowed for %(resource)s" -msgstr "不允许删除%(resource)s" +msgstr "不允许删除 %(resource)s" #, python-format msgid "%(resource)s does not implement update method" -msgstr "不支持更新%(resource)s" +msgstr "%(resource)s 未实现更新方法" #, python-format msgid "Create is not allowed for %(resource)s" -msgstr "不允许创建%(resource)s" +msgstr "不允许创建 %(resource)s " msgid "Unable to parse JSON request" -msgstr "无法解析JSON请求" +msgstr "无法解析 JSON 请求" msgid "This API only supports JSON" -msgstr "这个API仅支持JSON" +msgstr "此 API 仅支持 JSON" #, python-format msgid "Parameters does not match requirement in schema: %(err)s" -msgstr "参数不符合要求的格式：%(err)s" +msgstr "参数与模式中的需求不匹配：%(err)s" msgid "You don't have permission to perform this operation." -msgstr "您没有权限执行这项操作。" +msgstr "您不具有执行此操作的许可权。" #, python-format msgid "Unable to find task id: %(id)s" -msgstr "" +msgstr "找不到任务标识：%(id)s" msgid "There is no callback to execute the kill task process." -msgstr "" +msgstr "没有执行终止任务进程的回调。" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "任务'%(task)s超时%(seconds)s秒。" +msgstr "运行以下任务时，%(seconds)s 秒的超时已到期：%(task)s。" #, python-format msgid "Unable to kill task due error: %(err)s" -msgstr "" +msgstr "无法终止任务，因为发生了以下错误：%(err)s" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" -msgstr "用户'%(username)s'身份验证失败.[错误代码：%(code)s]" +msgstr "对用户“%(username)s”的认证失败。[错误代码：%(code)s]" msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "指定登录Wok的%(item)s" #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "无效的LDAP配置：%(item)s : %(value)s" +msgstr "无效 LDAP 配置：%(item)s : %(value)s" + +msgid "Specify password to login into Wok." +msgstr "指定登录Wok的%(item)s" + +msgid "You need to specify username and password to login into Wok." +msgstr "指定登录Wok的%(item)s" + +msgid "The username or password you entered is incorrect. Please try again" +msgstr "" #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" -msgstr "" +msgstr "无效过滤参数。允许的过滤参数：%(filters)s" #, python-format msgid "Creation of log file failed: %(err)s" -msgstr "" +msgstr "创建日志文件失败：%(err)s" #, python-format msgid "Unable to find notification %(id)s" -msgstr "" +msgstr "找不到通知 %(id)s" #, python-format msgid "Unable to delete notification %(id)s: %(message)s" -msgstr "" +msgstr "无法删除通知 %(id)s：%(message)s" #, python-format msgid "Unable to find %(item)s in datastore" -msgstr "在数据存储中找不到%(item)s" +msgstr "在数据存储器中找不到 %(item)s" #, python-format msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds" -msgstr "命令'%(cmd)s'运行%(seconds)s秒后超时。" +msgstr "运行命令“%(cmd)s”时，在 %(seconds)s 秒后超时" #, python-format msgid "Invalid data value '%(value)s'" -msgstr "" +msgstr "无效数据值“%(value)s”" #, python-format msgid "Invalid data unit '%(unit)s'" +msgstr "无效数据单元“%(unit)s”" + +msgid "WoK is going to restart. Existing WoK connections will be closed." msgstr "" #, python-format -msgid "Successfully completed task '%(target_uri)s'" +msgid "Unable to find plug-in %(name)s" msgstr "" #, python-format +msgid "Successfully completed task '%(target_uri)s'" +msgstr "已成功完成任务“%(target_uri)s”" + +#, python-format msgid "Failed to complete task '%(target_uri)s'" -msgstr "" +msgstr "无法完成任务“%(target_uri)s”" msgid "Request made on collection" +msgstr "针对集合发出了请求" + +msgid "Wok reload" msgstr "" msgid "Request made on resource" -msgstr "" +msgstr "针对资源发出了请求" #, python-format msgid "User '%(username)s' login" -msgstr "" +msgstr "用户“%(username)s”登录" #, python-format msgid "User '%(username)s' logout" +msgstr "用户“%(username)s”注销" + +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." msgstr "" msgid "ERROR CODE" -msgstr "错误码" +msgstr "错误代码" msgid "REASON" msgstr "原因" msgid "STACK" -msgstr "调用栈" +msgstr "堆栈" msgid "Go to Homepage" -msgstr "返回主页" +msgstr "转至主页" msgid "Wok" -msgstr "" +msgstr "Wok" msgid "Settings" -msgstr "" +msgstr "设置" msgid "No such data available." -msgstr "没有可用的数据" +msgstr "没有此类数据可用。" msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " -msgstr "" -"连接不上主机。请确保主机系统已启动，并且能通过网络连接主机。HTTP请求响应：%1" +msgstr "无法联系主机系统。验证主机系统是否已启动并且您是否已通过网络连接至该主机系统。HTTP 请求响应 %1。" msgid "Cancel" msgstr "取消" @@ -175,11 +206,14 @@ msgstr "取消" msgid "Confirm" msgstr "确认" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." -msgstr "正在加载..." +msgstr "正在装入..." msgid "An error occurred while retrieving system information." -msgstr "" +msgstr "检索系统信息时发生错误。" msgid "Retry" msgstr "重试" @@ -190,83 +224,99 @@ msgstr "详细消息：" msgid "Max:" msgstr "最大：" -msgid "Application" +msgid "Session timeout, please re-login." msgstr "" -msgid "User" +msgid "Server unreachable" msgstr "" +msgid "Application" +msgstr "应用程序" + +msgid "User" +msgstr "用户" + msgid "Request" -msgstr "" +msgstr "请求" msgid "Date" -msgstr "" +msgstr "日期" msgid "Time" -msgstr "" +msgstr "时间" msgid "Message" -msgstr "" +msgstr "消息" msgid "Please wait..." -msgstr "" +msgstr "请稍候..." msgid "Filter" -msgstr "" +msgstr "过滤器" msgid "Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries" -msgstr "" +msgstr "显示 {{ctx.start}} 到 {{ctx.end}} 个条目（共 {{ctx.total}} 个条目）" msgid "No results found!" -msgstr "" +msgstr "找不到结果！" msgid "Actions" -msgstr "" +msgstr "操作" msgid "Zone" msgstr "" msgid "IP Address" -msgstr "" +msgstr "IP 地址" msgid "Status" +msgstr "状态" + +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." msgstr "" -msgid "Your session will be expired on: %1 s. Do you want to renew it?" +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." msgstr "" +msgid "Your session will be expired on: %1 s. Do you want to renew it?" +msgstr "会话将于 %1 秒后到期。要更新吗？" + msgid "Ki" -msgstr "" +msgstr "Ki" msgid "Mi" -msgstr "" +msgstr "Mi" msgid "Gi" -msgstr "" +msgstr "Gi" msgid "Ti" -msgstr "" +msgstr "Ti" msgid "Pi" -msgstr "" +msgstr "Pi" msgid "k" -msgstr "" +msgstr "k" msgid "M" -msgstr "" +msgstr "M" msgid "G" -msgstr "" +msgstr "G" msgid "T" -msgstr "" +msgstr "T" msgid "P" -msgstr "" +msgstr "P" msgid "Log out" -msgstr "登出" +msgstr "注销" msgid "Help" msgstr "帮助" @@ -275,58 +325,70 @@ msgid "About" msgstr "关于" msgid "Toggle navigation" -msgstr "" +msgstr "切换导航" msgid "Your session will expire on: 30s. Do you want to renew it?" -msgstr "" +msgstr "会话将于 30 秒后到期。要更新吗？" msgid "Renew" -msgstr "" +msgstr "更新" msgid "Dismiss" -msgstr "" +msgstr "关闭" msgid "Powered by" -msgstr "" +msgstr "由以下技术提供支持" msgid "Wok Version" +msgstr "Wok 版本" + +msgid "Plugins Management" msgstr "" -msgid "User Activity Log" +msgid "Name" msgstr "" -msgid "Advanced Search" +msgid "Description" msgstr "" -msgid "Download" +msgid "No result found" msgstr "" +msgid "User Activity Log" +msgstr "用户活动日志" + +msgid "Advanced Search" +msgstr "高级搜索" + +msgid "Download" +msgstr "下载" + msgid "Refresh" -msgstr "" +msgstr "刷新" msgid "Search results by:" -msgstr "" +msgstr "按以下项搜索结果：" msgid "Request Type" -msgstr "" +msgstr "请求类型" msgid "All Requests" -msgstr "" +msgstr "所有请求" msgid "POST" -msgstr "" +msgstr "发布" msgid "GET" -msgstr "" +msgstr "获取" msgid "PUT" -msgstr "" +msgstr "放置" msgid "DELETE" -msgstr "" +msgstr "删除" msgid "User IP Address" -msgstr "" +msgstr "用户 IP 地址" msgid "Search" -msgstr "" +msgstr "搜索" diff --git a/po/zh_TW.po b/po/zh_TW.po index 400089e..eccca13 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-05 15:36-0200\n" +"POT-Creation-Date: 2017-03-02 12:51+0530\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" @@ -18,7 +18,7 @@ msgstr "" #, python-format msgid "Delete is not allowed for %(resource)s" -msgstr "不容許針對 %(resource)s 執行刪除" +msgstr "不容許針對 %(resource)s 執行刪除作業" #, python-format msgid "%(resource)s does not implement update method" @@ -26,7 +26,7 @@ msgstr "%(resource)s 未實作更新方法" #, python-format msgid "Create is not allowed for %(resource)s" -msgstr "不容許針對 %(resource)s 執行建立" +msgstr "不容許針對 %(resource)s 執行建立作業" msgid "Unable to parse JSON request" msgstr "無法剖析 JSON 要求" @@ -36,56 +36,70 @@ msgstr "此 API 僅支援 JSON" #, python-format msgid "Parameters does not match requirement in schema: %(err)s" -msgstr "" +msgstr "參數與綱目中的需求不符：%(err)s" msgid "You don't have permission to perform this operation." -msgstr "" +msgstr "您無權執行這項作業。" #, python-format msgid "Unable to find task id: %(id)s" -msgstr "" +msgstr "找不到作業 ID：%(id)s" msgid "There is no callback to execute the kill task process." -msgstr "" +msgstr "沒有回呼以執行結束作業程序。" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "執行作業 '%(task)s' 時，超過逾時值 %(seconds)s 秒。" #, python-format msgid "Unable to kill task due error: %(err)s" -msgstr "" +msgstr "由於發生錯誤，無法結束作業：%(err)s" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" -msgstr "使用者 '%(username)s' 的鑑別失敗。[錯誤碼：%(code)s]" +msgstr "針對使用者 '%(username)s' 的鑑別失敗。[錯誤碼：%(code)s]" msgid "You are not authorized to access Wok. Please, login first." msgstr "" -#, python-format -msgid "Specify %(item)s to login into Wok." +msgid "Specify username to login into Wok." msgstr "指定 %(item)s 以登入 Wok" #, python-format +msgid "" +"You have failed to login in too much attempts. Please, wait for %(seconds)s " +"seconds to try again." +msgstr "" + +#, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "LDAP 配置無效：%(item)s：%(value)s" + +msgid "Specify password to login into Wok." +msgstr "指定 %(item)s 以登入 Wok" + +msgid "You need to specify username and password to login into Wok." +msgstr "指定 %(item)s 以登入 Wok" + +msgid "The username or password you entered is incorrect. Please try again" msgstr "" #, python-format msgid "Invalid filter parameter. Filter parameters allowed: %(filters)s" -msgstr "" +msgstr "過濾參數無效。容許的過濾參數：%(filters)s" #, python-format msgid "Creation of log file failed: %(err)s" -msgstr "" +msgstr "建立日誌檔失敗：%(err)s" #, python-format msgid "Unable to find notification %(id)s" -msgstr "" +msgstr "找不到通知 %(id)s" #, python-format msgid "Unable to delete notification %(id)s: %(message)s" -msgstr "" +msgstr "無法刪除通知 %(id)s：%(message)s" #, python-format msgid "Unable to find %(item)s in datastore" @@ -93,36 +107,54 @@ msgstr "在資料儲存庫中找不到 %(item)s" #, python-format msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds" -msgstr "執行指令 '%(cmd)s' %(seconds)s 秒之後逾時" +msgstr "執行指令 '%(cmd)s' 時，在 %(seconds)s 秒之後逾時" #, python-format msgid "Invalid data value '%(value)s'" -msgstr "" +msgstr "無效的資料值 '%(value)s'" #, python-format msgid "Invalid data unit '%(unit)s'" +msgstr "無效的資料單元 '%(unit)s'" + +msgid "WoK is going to restart. Existing WoK connections will be closed." msgstr "" #, python-format -msgid "Successfully completed task '%(target_uri)s'" +msgid "Unable to find plug-in %(name)s" msgstr "" #, python-format +msgid "Successfully completed task '%(target_uri)s'" +msgstr "已順利完成作業 '%(target_uri)s'" + +#, python-format msgid "Failed to complete task '%(target_uri)s'" -msgstr "" +msgstr "無法完成作業 '%(target_uri)s'" msgid "Request made on collection" +msgstr "已對集合發出要求" + +msgid "Wok reload" msgstr "" msgid "Request made on resource" -msgstr "" +msgstr "已對資源發出要求" #, python-format msgid "User '%(username)s' login" -msgstr "" +msgstr "使用者 '%(username)s' 登入" #, python-format msgid "User '%(username)s' logout" +msgstr "使用者 '%(username)s' 登出" + +#, python-format +msgid "Enable plug-in %(ident)s." +msgstr "" + +#, python-format +msgid "Disable plug-in %(ident)s." msgstr "" msgid "ERROR CODE" @@ -138,116 +170,133 @@ msgid "Go to Homepage" msgstr "跳至首頁" msgid "Wok" -msgstr "" +msgstr "Wok" msgid "Settings" -msgstr "" +msgstr "設定" msgid "No such data available." -msgstr "沒有此類可用資料。" +msgstr "沒有此類資料可用。" msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " -msgstr "" -"無法連接至主機系統。請驗證主機系統是否已啟動，以及您是否具有與它的連線。HTTP " -"要求回應為 %1。" +msgstr "無法聯絡主機系統。請驗證主機系統已啟動，並且您具有與該主機系統的網路連線。HTTP 要求回應為 %1。" msgid "Cancel" -msgstr "取消 " +msgstr "取消" msgid "Confirm" msgstr "確認" +msgid "Action Confirmation" +msgstr "" + msgid "Loading..." -msgstr "正在載入..." +msgstr "載入中..." msgid "An error occurred while retrieving system information." -msgstr "" +msgstr "擷取系統資訊時發生錯誤。" msgid "Retry" msgstr "重試" msgid "Detailed message:" -msgstr "詳細的訊息：" +msgstr "詳細訊息：" msgid "Max:" msgstr "上限：" -msgid "Application" +msgid "Session timeout, please re-login." msgstr "" -msgid "User" +msgid "Server unreachable" msgstr "" +msgid "Application" +msgstr "應用程式" + +msgid "User" +msgstr "使用者" + msgid "Request" -msgstr "" +msgstr "要求" msgid "Date" -msgstr "" +msgstr "日期" msgid "Time" -msgstr "" +msgstr "時間" msgid "Message" -msgstr "" +msgstr "訊息" msgid "Please wait..." -msgstr "" +msgstr "請稍候..." msgid "Filter" -msgstr "" +msgstr "過濾器" msgid "Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries" -msgstr "" +msgstr "顯示 {{ctx.start}} 至 {{ctx.end}} 個項目（共 {{ctx.total}} 個項目）" msgid "No results found!" -msgstr "" +msgstr "找不到結果！" msgid "Actions" -msgstr "" +msgstr "動作" msgid "Zone" msgstr "" msgid "IP Address" -msgstr "" +msgstr "IP 位址" msgid "Status" +msgstr "狀態" + +msgid "" +"Plugin %1 depends on %2 which will be automatically enabled on this " +"confirmation." msgstr "" -msgid "Your session will be expired on: %1 s. Do you want to renew it?" +msgid "" +"Plugin %1 is dependency of %2 which will be automatically disabled on this " +"confirmation." msgstr "" +msgid "Your session will be expired on: %1 s. Do you want to renew it?" +msgstr "您的階段作業將於 %1 後到期。您要更新該階段作業嗎？" + msgid "Ki" -msgstr "" +msgstr "Ki" msgid "Mi" -msgstr "" +msgstr "Mi" msgid "Gi" -msgstr "" +msgstr "Gi" msgid "Ti" -msgstr "" +msgstr "Ti" msgid "Pi" -msgstr "" +msgstr "Pi" msgid "k" -msgstr "" +msgstr "k" msgid "M" -msgstr "" +msgstr "M" msgid "G" -msgstr "" +msgstr "G" msgid "T" -msgstr "" +msgstr "T" msgid "P" -msgstr "" +msgstr "P" msgid "Log out" msgstr "登出" @@ -256,61 +305,73 @@ msgid "Help" msgstr "說明" msgid "About" -msgstr "相關" +msgstr "關於" msgid "Toggle navigation" -msgstr "" +msgstr "切換導覽" msgid "Your session will expire on: 30s. Do you want to renew it?" -msgstr "" +msgstr "您的階段作業將於 30 秒後到期。您要更新該階段作業嗎？" msgid "Renew" -msgstr "" +msgstr "更新" msgid "Dismiss" -msgstr "" +msgstr "跳出" msgid "Powered by" -msgstr "" +msgstr "採用以下技術" msgid "Wok Version" +msgstr "Wok 版本：" + +msgid "Plugins Management" msgstr "" -msgid "User Activity Log" +msgid "Name" msgstr "" -msgid "Advanced Search" +msgid "Description" msgstr "" -msgid "Download" +msgid "No result found" msgstr "" +msgid "User Activity Log" +msgstr "使用者活動日誌" + +msgid "Advanced Search" +msgstr "進階搜尋" + +msgid "Download" +msgstr "下載" + msgid "Refresh" -msgstr "" +msgstr "重新整理" msgid "Search results by:" -msgstr "" +msgstr "產生搜尋結果的依據：" msgid "Request Type" -msgstr "" +msgstr "要求類型" msgid "All Requests" -msgstr "" +msgstr "所有要求" msgid "POST" -msgstr "" +msgstr "POST" msgid "GET" -msgstr "" +msgstr "GET" msgid "PUT" -msgstr "" +msgstr "PUT" msgid "DELETE" -msgstr "" +msgstr "DELETE" msgid "User IP Address" -msgstr "" +msgstr "使用者 IP 位址" msgid "Search" -msgstr "" +msgstr "搜尋" -- 2.1.0

2 1

[GITHUB] Adding file CONTRIBUTING.md
by Ramon Medeiros 07 Mar '17

07 Mar '17

Hi, we can add the file CONTRIBUTING.md to the root folder. This will add a text when a issue is opened, guiding the tester to open issues with more details. Example: Try to open a issue here https://github.com/rg3/youtube-dl/issues You'll see this content: https://github.com/rg3/youtube-dl/blob/master/CONTRIBUTING.md

3 2

[PATCH] [Kimchi 0/2] Bug fix #1091: Allow to set disk performance options per guest and template
by Ramon Medeiros 07 Mar '17

07 Mar '17

Allow disk bus to be specified on creation based on commits: Allow disks to update cache and io flags Add tests to verify if cache and io of a disk can be changed Ramon Medeiros (2): Bug fix #1091: Allow to set disk performance options per guest and template Add tests for disk creation with specified bus driver model/vmstorages.py | 4 +++- tests/test_model.py | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) -- 2.9.3

2 5

[PATCH] [Kimchi 0/2] Allow disks to update cache and io flags
by Ramon Medeiros 07 Mar '17

07 Mar '17

Ramon Medeiros (2): Allow disks to update cache and io flags Add tests to verify if cache and io of a disk can be changed API.json | 11 ++++++++++- docs/API.md | 3 +++ i18n.py | 1 - model/vmstorages.py | 57 +++++++++++++++++++++++++++++++++-------------------- tests/test_model.py | 7 +++++++ xmlutils/disk.py | 12 ++++++++++- 6 files changed, 67 insertions(+), 24 deletions(-) -- 2.9.3

2 4

[PATCH] [Kimchi] Allow kvmusertests to run with regular user
by Lucio Correia 07 Mar '17

07 Mar '17

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- kvmusertests.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kvmusertests.py b/kvmusertests.py index a3fb273..3b3a603 100644 --- a/kvmusertests.py +++ b/kvmusertests.py @@ -1,6 +1,6 @@ # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,6 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import libvirt +import os import platform import psutil import threading @@ -56,12 +57,18 @@ class UserTests(object): with RollbackContext() as rollback: with cls.lock: - conn = libvirt.open(None) + conn = libvirt.open("qemu:///session") rollback.prependDefer(conn.close) f = libvirt.VIR_DOMAIN_START_AUTODESTROY dom = conn.createXML(xml, flags=f) rollback.prependDefer(dom.destroy) - filename = '/var/run/libvirt/qemu/%s.pid' % KVMUSERTEST_VM_NAME + + # find pid file for VM + uid = str(os.getuid()) + filedir = os.path.join('/run/user', uid, 'libvirt/qemu/run') + if uid == '0': + filedir = '/var/run/libvirt/qemu' + filename = os.path.join(filedir, KVMUSERTEST_VM_NAME + ".pid") with open(filename) as f: pidStr = f.read() p = psutil.Process(int(pidStr)) -- 2.7.4

2 1

[PATCH] [Kimchi] Fix typo
by Lucio Correia 07 Mar '17

07 Mar '17

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- model/storagepools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/storagepools.py b/model/storagepools.py index cc4b906..3623f45 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -131,7 +131,7 @@ class StoragePoolsModel(object): try: pool.create(0) except libvirt.libvirtError, e: - msg = "Fatal: Unable to craete storage pool %s. " + msg = "Fatal: Unable to create storage pool %s. " wok_log.error(msg % pool_name) wok_log.error("Details: %s", e.message) raise Exception(error_msg) -- 2.7.4

2 1

[PATCH] [Wok] Allow a plugin extends any HTML page from another one instead of only tabs content
by Aline Manera 03 Mar '17

03 Mar '17

Before this patch, a plugin could only extend anothers tab content. With this patch, a plugin can extend any HTML page from others. This is needed due the Ginger sidebar and Ginger s390x dependency. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/root.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/wok/root.py b/src/wok/root.py index c01c7d1..ea88c8c 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -101,6 +101,7 @@ class Root(Resource): @cherrypy.expose def default(self, page, **kwargs): + kwargs['scripts'] = self._get_scripts(page) if page.endswith('.html'): return template.render(page, kwargs) if page.endswith('.json'): @@ -121,13 +122,7 @@ class Root(Resource): data = {} data['ui_dir'] = paths.ui_dir - - data['scripts'] = [] - for plugin, app in cherrypy.tree.apps.iteritems(): - if app.root.extends is not None: - scripts = app.root.extends.get(script_name, {}) - if page in scripts.keys(): - data['scripts'].append(scripts[page]) + data['scripts'] = self._get_scripts(page) if page.endswith('.html'): context = template.render('/tabs/' + page, data) @@ -136,6 +131,16 @@ class Root(Resource): return context raise cherrypy.HTTPError(404) + def _get_scripts(self, page): + result = [] + script_name = cherrypy.request.app.script_name or "/" + for plugin, app in cherrypy.tree.apps.iteritems(): + if app.root.extends is not None: + scripts = app.root.extends.get(script_name, {}) + if page in scripts.keys(): + result.append(scripts[page]) + return result + class WokRoot(Root): def __init__(self, model, dev_env=False): -- 2.9.3

2 2

[PATCH] [Wok] Bug fix: Pass function parameters when calling setTimeout
by Aline Manera 03 Mar '17

03 Mar '17

The issue was identified when loading Wok UI on Chrome but it could happen on any browser if the request to /plugins takes more than expected. All that, because the setTimeout function was not passing the parameters to the second call to buildTabs. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 20c017e..c8c3889 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -141,7 +141,7 @@ wok.main = function() { var buildTabs = function(callback) { // Make wok.plugins is ready to be used if (wok.plugins == undefined) { - setTimeout(buildTabs, 2000); + setTimeout(function() {buildTabs(callback)}, 2000); return; } -- 2.9.3

2 2

Please help me on issue 1112 on kimchi project
by Nam Le 02 Mar '17

02 Mar '17

Hi Kimchi Dev Teams, I raised a issue on https://github.com/kimchi-project/kimchi/issues/1112 Please kindly the help me debug on this. Thanks a lot. Hope to get your feed back. Regards, Nam Le

1 0