February 2015 - Kimchi-devel - oVirt List Archives

RFC - Guest memory usage
by Daniel Henrique Barboza 27 Oct '15

27 Oct '15

I was looking at the following item in the backlog: Guests Stats: Display memory utilization (use virt-df or virt-top or ...) If I understood it right, the idea here is to show the -inner- memory allocation of the guest. If you have a VM with 4Gb of RAM running an Ubuntu, we want to know how much memory the Ubuntu OS and its processes are using. I've done an investigation and I haven't found any tool to accomplish this. "virt-top", "virsh dommemstat" and the libvirt API retrieves the information of the memory usage of the guest relative to the host. In the example mentioned before, supposing that the host has 64Gb of RAM, all these tools would show that the VM is using 12% of the host RAM. They do not dive in the VM and shows the actual mem usage of the Ubuntu and its processes running there. Haven't found anything useful in other MLs and forums. The common answer is 'run top in a terminal inside the VM', which of course does not suit us. My question is: any thoughts about how we can implement this feature? Because I am starting to think that, in the end, this kind of info is strict to the guest OS and can't be polled from the outside. Thanks!

5 5

[kimchi-devel][PATCHv3 0/6] Upload storage volume
by lvroyce＠linux.vnet.ibm.com 03 Apr '15

03 Apr '15

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> known issue: When using api to send requests without setting up session, cherrypy server will report error after hundred of calls, because race condition below: https://bitbucket.org/cherrypy/cherrypy/pull-request/50/fix-race-condition-… But it works well with session setup. v3>v1, Use libvirt upload api instead of r/w file Use lock to synchronize upload to prevent Royce Lv (6): Update docs and json schema of storage volume upload Update controller to make update accept formdata params Add lock facility for storage volume upload Update model for storage volume update Fix incomplete record when uploading update test case for storage volume upload docs/API.md | 7 ++-- src/kimchi/API.json | 19 +++++++++++ src/kimchi/control/base.py | 6 ++-- src/kimchi/i18n.py | 4 +++ src/kimchi/isoinfo.py | 5 ++- src/kimchi/mockmodel.py | 8 ++--- src/kimchi/model/storagevolumes.py | 61 +++++++++++++++------------------- src/kimchi/model/utils.py | 46 ++++++++++++++++++++++++++ tests/test_model.py | 67 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 177 insertions(+), 46 deletions(-) -- 2.1.0

3 20

[PATCH] RFC patch to make nginx proxy optional
by Julien Goodwin 03 Apr '15

03 Apr '15

Sending this as an RFC patch, I expect people will want changes from this. Implements Issue #570. Julien Goodwin (1): Initial prototype, make nginx proxy optional. docs/Makefile.am | 1 + docs/apache.conf.ex | 35 +++++++++++++++++++++++++++++++++++ src/kimchi.conf.in | 3 +++ src/kimchi/config.py.in | 1 + src/kimchi/proxy.py | 6 ++++++ 5 files changed, 46 insertions(+) create mode 100644 docs/apache.conf.ex -- 2.1.4

4 18

[RFC] New API to create a random guest console password
by Aline Manera 02 Apr '15

02 Apr '15

Today user may set/change the guest console password and also its expiration time through Kimchi API. When passing an empty password, a random password is automatically generated. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwd": ""}}' That way is difficult to handle when user wants to reset the guest password. We have a similar issue when we automatically change the passwdValidTo when it is expired - increasing it in 30 seconds. My proposal is simple: only change "passwd" and "passwdValidTo" when user wants to do it. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwd": "123456", "passwdValidTo": "<some datetime format>"}}' curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwdValidTo": "<some datetime format>"}}' And make sure the passwdValidTo is only acceptable when there is a passwd set. And to reset those values, we only need to send an empty string: curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"password": "", "passwdValidTo": ""}}' And create a new API: POST /vms/blah/ticket to automatically generate a random password valid only for 30 seconds. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah/ticket -X POST -d'{}' What do you think about it? Regards, Aline Manera

2 3

[PATCH][RFC] Kimchi and relative URLs
by Frédéric Bonnard 01 Apr '15

01 Apr '15

From: Frederic Bonnard <frediz(a)linux.vnet.ibm.com> Hi, many people and distros use a subdirectory in the configuration of the system's webserver to configure different websites. The usual way to setup a website is thus to : 1. use the distro's webserver to serve all the websites 2. have a subdirectory to copy the configuration file that makes available a website by only restarting the webserver (and removing the website is just done by removing the configuration file and restart). Concerning this point, the classical configurations can be : a) a sub web location : https://website.org/webapp b) a virtual host : http://webapp.website.org a) and b) correspond each to different configuration files that are just dropped into : - Ubuntu/Debian : /etc/{apache,nginx,..}/sites-available/{webapp_subweb,webapp_virthost}.conf - Fedora/Opensuse : /etc/{httpd,nginx,..}/conf.d/ At the moment kimchi is launched with a private instance of nginx, not the system's installed one and it would be nice to have this improved and this is covered in another thread : http://lists.ovirt.org/pipermail/kimchi-devel/2015-February/009642.html Provided that previous patch, one can use the distro's webserver to run proxy kimchi and that fullfills 1. Then for 2. one need a configuration file for either b) (provided for apache in the link above ; I have also one for nginx ) and a), which I provide in this patch. But this nginx configuration file is not enough for a sub web location configuration as kimchi relies on absolute path based on / from the http://server/. I tried to make URLs paths relative so that kimchi doesn't have to know where it has been placed on the webserver, for example https://server/kimchi/ which will probably be the URL used in distros. I'm not a web developer and I tried to modify all failing requests with a a) configuration with relative paths in mind. So I'd like comments on the way this is done, and this may need more extensive testing (paths I didn't test). Though I used that code back on a virtualhost configuration and it worked as well. Thanks for your help, F. Frederic Bonnard (1): Making urls relative docs/Makefile.am | 1 + docs/nginx.conf.subsite.ex | 37 +++++++ src/kimchi/screenshot.py | 2 +- ui/css/theme-default/template_add.css | 20 ++-- ui/css/theme-default/topbar.css | 2 +- ui/js/src/kimchi.api.js | 176 +++++++++++++++++----------------- ui/js/src/kimchi.login.js | 2 +- ui/pages/guest.html.tmpl | 2 +- ui/pages/help/dita-help.xsl | 4 +- ui/pages/kimchi-ui.html.tmpl | 4 +- ui/pages/storagepool-add.html.tmpl | 2 +- ui/pages/tabs/storage.html.tmpl | 2 +- ui/pages/template-add.html.tmpl | 2 +- 13 files changed, 147 insertions(+), 109 deletions(-) create mode 100644 docs/nginx.conf.subsite.ex -- 1.9.1

4 9

[kimchi-devel][PATCH 0/2] Fix error usage of feature tests
by lvroyce＠linux.vnet.ibm.com 13 Mar '15

13 Mar '15

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Feature tests depend on running kimchi server should not be used in model tests, while coincidently, command "qemu-io -r http://localhost:8080/images/icon-fedora.png -c 'read -v 0 512'" return code is 0 so we cannot count on the return code. This patch forces module usage without running kimchi server to return false, and fixes testcase accordingly. REF: https://github.com/kimchi-project/kimchi/issues/579 https://github.com/kimchi-project/kimchi/issues/580 Royce Lv (2): Avoid using server dependent feature tests when server not running Fix wrong usage of feature tests src/kimchi/model/featuretests.py | 5 ++++- src/kimchi/utils.py | 8 ++++++++ tests/test_model.py | 16 +++++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) -- 1.9.3

3 6

[PATCH v2] Remove Non-ASCII chars from tests when unnecessary
by Christy Perez 11 Mar '15

11 Mar '15

A domain with non-ASCII characters will fail to start. There are several tests that use such characters, and these tests fail. None of the failing tests are required to test the validity of non-ascii characters, so it's best to remove them and create seperate tests explicitly for these chracters. This way we will not be masking actual issues by ignoring an expected failure. The issue was first noticed with libvirt 1.1.3. The character issue is discussed in this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1062943 Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- tests/test_model.py | 112 +++++++++++++++++++++++++++----------- tests/test_model_network.py | 6 +- tests/test_model_storagepool.py | 27 +++++++++ tests/test_model_storagevolume.py | 1 - 4 files changed, 113 insertions(+), 33 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index f80f1c9..ada7498 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -97,6 +97,44 @@ def test_vm_info(self): self.assertTrue(info['persistent']) @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + def test_non_ascii_vm_name(self): + inst = model.Model(objstore_loc=self.tmp_store) + + with RollbackContext() as rollback: + vol_params = {'name': u'test-vol', 'capacity': 1024} + task = inst.storagevolumes_create(u'default', vol_params) + rollback.prependDefer(inst.storagevolume_delete, u'default', + vol_params['name']) + inst.task_wait(task['id']) + task = inst.task_lookup(task['id']) + self.assertEquals('finished', task['status']) + vol = inst.storagevolume_lookup(u'default', vol_params['name']) + + # Create template + params = {'name': 'test', 'disks': [{'base': vol['path'], + 'size': 1}], + 'cdrom': self.kimchi_iso} + inst.templates_create(params) + rollback.prependDefer(inst.template_delete, 'test') + + # Create VM with non-ascii char name + params = {'name': u'��e��-��', 'template': '/templates/test'} + inst.vms_create(params) + rollback.prependDefer(inst.vm_delete, u'��e��-��') + + vms = inst.vms_get_list() + self.assertTrue(u'��e��-��' in vms) + + # Start VM + # Note: This fails with libvirt > 1.1.3 + inst.vm_start(u'��e��-��') + info = inst.vm_lookup(u'��e��-��') + self.assertEquals('running', info['state']) + + vms = inst.vms_get_list() + self.assertFalse(u'��e��-��' in vms) + + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_lifecycle(self): inst = model.Model(objstore_loc=self.tmp_store) @@ -620,6 +658,18 @@ def test_template_storage_customise(self): params = {'storagepool': '/storagepools/default'} inst.template_update('test', params) + def test_non_ascii_template_create(self): + inst = model.Model('test:///default', + objstore_loc=self.tmp_store) + + with RollbackContext() as rollback: + params = {'name': u'��e��-te��plate', 'memory': 1024, 'cpus': 1, + 'cdrom': self.kimchi_iso} + inst.templates_create(params) + rollback.prependDefer(inst.template_delete, u'��e��-te��plate') + info = inst.template_lookup(u'��e��-te��plate') + self.assertEquals(info['name'], u'��e��-te��plate') + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_create(self): inst = model.Model('test:///default', @@ -737,7 +787,7 @@ def test_template_update(self): inst.network_activate(net_name) rollback.prependDefer(inst.network_deactivate, net_name) - net_name = u'k��h��-��et' + net_name = u'kimchi-net' net_args = {'name': net_name, 'connection': 'nat', 'subnet': '127.0.20.0/24'} @@ -764,7 +814,7 @@ def test_template_update(self): self.assertEquals("default", info["networks"][0]) params = {'name': 'new-test', 'memory': 1024, 'cpus': 1, - 'networks': ['default', 'test-network', u'k��h��-��et']} + 'networks': ['default', 'test-network', u'kimchi-net']} inst.template_update('new-test', params) info = inst.template_lookup('new-test') for key in params.keys(): @@ -792,7 +842,7 @@ def test_template_update(self): self.assertEquals('some-vm', inst.vms_create(params)) rollback.prependDefer(inst.vm_delete, 'some-vm') - iface_args = {'type': 'network', 'network': u'k��h��-��et'} + iface_args = {'type': 'network', 'network': u'kimchi-net'} mac = inst.vmifaces_create('some-vm', iface_args) self.assertEquals(17, len(mac)) @@ -865,52 +915,52 @@ def test_vm_edit(self): self.assertRaises(OperationFailed, inst.vm_update, 'kimchi-vm1', {'name': 'kimchi-vm2'}) - params = {'name': u'��e��-��', 'cpus': 4, 'memory': 2048} + params = {'name': u'new-vm', 'cpus': 4, 'memory': 2048} inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, - u'��e��-��') - self.assertEquals(info['uuid'], inst.vm_lookup(u'��e��-��')['uuid']) - info = inst.vm_lookup(u'��e��-��') + u'new-vm') + self.assertEquals(info['uuid'], inst.vm_lookup(u'new-vm')['uuid']) + info = inst.vm_lookup(u'new-vm') for key in params.keys(): self.assertEquals(params[key], info[key]) # change only VM users - groups are not changed (default is empty) users = inst.users_get_list()[:3] - inst.vm_update(u'��e��-��', {'users': users}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals([], inst.vm_lookup(u'��e��-��')['groups']) + inst.vm_update(u'new-vm', {'users': users}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals([], inst.vm_lookup(u'new-vm')['groups']) # change only VM groups - users are not changed (default is empty) groups = inst.groups_get_list()[:2] - inst.vm_update(u'��e��-��', {'groups': groups}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals(groups, inst.vm_lookup(u'��e��-��')['groups']) + inst.vm_update(u'new-vm', {'groups': groups}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups by adding a new element to each one users.append(pwd.getpwuid(os.getuid()).pw_name) groups.append(grp.getgrgid(os.getgid()).gr_name) - inst.vm_update(u'��e��-��', {'users': users, 'groups': groups}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals(groups, inst.vm_lookup(u'��e��-��')['groups']) + inst.vm_update(u'new-vm', {'users': users, 'groups': groups}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users (wrong value) and groups # when an error occurs, everything fails and nothing is changed - self.assertRaises(InvalidParameter, inst.vm_update, u'��e��-��', + self.assertRaises(InvalidParameter, inst.vm_update, u'new-vm', {'users': ['userdoesnotexist'], 'groups': []}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals(groups, inst.vm_lookup(u'��e��-��')['groups']) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups (wrong value) # when an error occurs, everything fails and nothing is changed - self.assertRaises(InvalidParameter, inst.vm_update, u'��e��-��', + self.assertRaises(InvalidParameter, inst.vm_update, u'new-vm', {'users': [], 'groups': ['groupdoesnotexist']}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals(groups, inst.vm_lookup(u'��e��-��')['groups']) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups by removing all elements - inst.vm_update(u'��e��-��', {'users': [], 'groups': []}) - self.assertEquals([], inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals([], inst.vm_lookup(u'��e��-��')['groups']) + inst.vm_update(u'new-vm', {'users': [], 'groups': []}) + self.assertEquals([], inst.vm_lookup(u'new-vm')['users']) + self.assertEquals([], inst.vm_lookup(u'new-vm')['groups']) def test_multithreaded_connection(self): def worker(): @@ -1090,19 +1140,19 @@ def test_delete_running_vm(self): inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') - params = {'name': u'k��h��-��', 'template': u'/templates/test'} + params = {'name': 'kimchi-vm', 'template': u'/templates/test'} inst.vms_create(params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, - u'k��h��-��') + 'kimchi-vm') - inst.vm_start(u'k��h��-��') + inst.vm_start('kimchi-vm') rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, - u'k��h��-��') + 'kimchi-vm') - inst.vm_delete(u'k��h��-��') + inst.vm_delete('kimchi-vm') vms = inst.vms_get_list() - self.assertFalse(u'k��h��-��' in vms) + self.assertFalse('kimchi-vm' in vms) @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_list_sorted(self): diff --git a/tests/test_model_network.py b/tests/test_model_network.py index 5dbe54d..c61f37c 100644 --- a/tests/test_model_network.py +++ b/tests/test_model_network.py @@ -99,6 +99,10 @@ class NetworkTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) + def test_non_ascii_net_names(self): + net = {'name': u'k��h��-��et', 'connection': 'isolated'} + _do_network_test(self, model, net) + def test_get_networks(self): networks = json.loads(self.request('/networks').read()) self.assertIn('default', [net['name'] for net in networks]) @@ -127,7 +131,7 @@ def test_get_networks(self): def test_network_lifecycle(self): # Verify all the supported network type - networks = [{'name': u'k��h��-��et', 'connection': 'isolated'}, + networks = [{'name': u'kimchi-net', 'connection': 'isolated'}, {'name': u'nat-network', 'connection': 'nat'}, {'name': u'subnet-network', 'connection': 'nat', 'subnet': '127.0.100.0/24'}] diff --git a/tests/test_model_storagepool.py b/tests/test_model_storagepool.py index eabf875..de4469d 100644 --- a/tests/test_model_storagepool.py +++ b/tests/test_model_storagepool.py @@ -60,6 +60,33 @@ class StoragepoolTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) + def test_non_ascii_storagepool_name(self): + storagepools = json.loads(self.request('/storagepools').read()) + self.assertIn('default', [pool['name'] for pool in storagepools]) + + with RollbackContext() as rollback: + name = u'k��h��-storagepool' + req = json.dumps({'name': name, 'type': 'dir', + 'path': '/var/lib/libvirt/images/test_pool'}) + resp = self.request('/storagepools', req, 'POST') + rollback.prependDefer(model.storagepool_delete, name) + + self.assertEquals(201, resp.status) + + # Verify pool information + resp = self.request('/storagepools/%s' % name.encode("utf-8")) + p = json.loads(resp.read()) + keys = [u'name', u'state', u'capacity', u'allocated', + u'available', u'path', u'source', u'type', + u'nr_volumes', u'autostart', u'persistent'] + self.assertEquals(sorted(keys), sorted(p.keys())) + self.assertEquals(name, p['name']) + resp = self.request('/storagepools/%s/activate' + % name.encode('utf-8'), req, 'POST') + rollback.prependDefer(model.storagepool_deactivate, name) + p = json.loads(resp.read()) + self.assertEquals('active', p['state']) + def test_get_storagepools(self): storagepools = json.loads(self.request('/storagepools').read()) self.assertIn('default', [pool['name'] for pool in storagepools]) diff --git a/tests/test_model_storagevolume.py b/tests/test_model_storagevolume.py index a3c3ce3..39531e9 100644 --- a/tests/test_model_storagevolume.py +++ b/tests/test_model_storagevolume.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Project Kimchi # -- 2.1.0

2 5

[PATCH] Change python #! line to be more portable
by Alan Jenkins 05 Mar '15

05 Mar '15

Hey guys, This is a patch to change the #! line used in Kimchi from the ambiguous /usr/bin/python to a more specific and more portable /usr/bin/env python2. This enables users of distributions that have switched to the default python version to python3 to run Kimchi without having to go and manually change the line and at the same time allows people who have python installed to non default locations to also use Kimchi by setting the python2 environment variable. Thanks, Alan Jenkins (demon012) Alan Jenkins (1): Change from using /usr/bin/python to /usr/bin/env python2 to improve portability. contrib/check_i18n.py | 2 +- src/kimchi/vnc.py | 2 +- src/kimchid.in | 2 +- ui/pages/help/gen-index.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.2.2

2 5

[PATCH v2 0/5] Create VMs Asynchronously
by Christy Perez 04 Mar '15

04 Mar '15

If a guest has a large disk, and uses a filesystem that requires preallocation, it can take several minutes to create a VM. During that time, kimchi is tied up by the VM creation. This patch changes the VMs Collection to be an AsyncCollection. Another change required for this was to create a more granular way to query tasks. Currently it is not possible (using the API) to query tasks for the same collection or resource type that may have different operations. For example, VM cloning is also an asynchronous operation. For the guests tab, the UI was querying all running tasks and displaying them with the Cloning label. This picked up VMs that were being created as well. For more information about how the tasks can be queried, see the updated API doc and the UI change. Christy Perez (5): Granular Task Queries: Backend Granular task queries test updates More Granular Task Queries: UI Create guests asynchronously: Backend Async vm creation test updates docs/API.md | 14 +++++++ src/kimchi/asynctask.py | 6 ++- src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 7 ++-- src/kimchi/model/debugreports.py | 4 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagevolumes.py | 7 ++-- src/kimchi/model/tasks.py | 1 - src/kimchi/model/vms.py | 33 ++++++++++++--- src/kimchi/model/vmsnapshots.py | 3 +- src/kimchi/utils.py | 4 +- tests/test_authorization.py | 23 ++++++----- tests/test_mockmodel.py | 15 +++++-- tests/test_model.py | 62 ++++++++++++++++++---------- tests/test_rest.py | 82 ++++++++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 2 +- 17 files changed, 192 insertions(+), 81 deletions(-) -- 2.1.0

4 16

[PATCH] issue #545: Handle simultaneous authentication methods when updating VM permission
by Crístian Viana 03 Mar '15

03 Mar '15

If a VM has one authentication method in its metadata (e.g. 'pam') and a user sets some permissions with a different authentication method (e.g. 'ldap'), then the group of the first authentication method is lost and only the last type is kept. In other words, it is not possible to have more than one authenticatin type in a VM's metadata. Add the ability to handle different authentication methods simultaneously when updating VM permission. Whatever is already set will always be kept, even if the user chooses a different method. Fix issue #545 (VM permission data is lost when changing authentication method). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 54 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 379c850..018df9e 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -552,18 +552,48 @@ class VMModel(object): # remove the new object store entry should an error occur later rollback.prependDefer(_rollback_objstore) - def _build_access_elem(self, users, groups): + def _build_access_elem(self, dom, users, groups): auth = config.get("authentication", "method") - auth_elem = E.auth(type=auth) - for user in users: - auth_elem.append(E.user(user)) + access_xml = get_metadata_node(dom, "access", + self.caps.metadata_support) - for group in groups: - auth_elem.append(E.group(group)) + auth_elem = None - access = E.access() - access.append(auth_elem) - return access + if not access_xml: + # there is no metadata element 'access' + access_elem = E.access() + else: + access_elem = ET.fromstring(access_xml) + + same_auth = access_elem.xpath('./auth[@type="%s"]' % auth) + if len(same_auth) > 0: + # there is already a sub-element 'auth' with the same type; + # update it. + auth_elem = same_auth[0] + + if users is not None: + for u in auth_elem.findall('user'): + auth_elem.remove(u) + + if groups is not None: + for g in auth_elem.findall('group'): + auth_elem.remove(g) + + if auth_elem is None: + # there is no sub-element 'auth' with the same type + # (or no 'auth' at all); create it. + auth_elem = E.auth(type=auth) + access_elem.append(auth_elem) + + if users is not None: + for u in users: + auth_elem.append(E.user(u)) + + if groups is not None: + for g in groups: + auth_elem.append(E.group(g)) + + return access_elem def _vm_update_access_metadata(self, dom, params): users = groups = None @@ -583,11 +613,7 @@ class VMModel(object): if users is None and groups is None: return - old_users, old_groups = self._get_access_info(dom) - users = old_users if users is None else users - groups = old_groups if groups is None else groups - - node = self._build_access_elem(users, groups) + node = self._build_access_elem(dom, users, groups) set_metadata_node(dom, node, self.caps.metadata_support) def _get_access_info(self, dom): -- 2.1.0

2 4

[PATCH 0/2] Change radios and checkboxes in first 4 dialogs
by Wen Wang 02 Mar '15

02 Mar '15

1) Add icons to the help text 2) Change all the radios and checkboxes in frist 4 tabs of dialog Wen Wang (2): UI Add text help icon to dialog of first 4 tabs UI: complete kimchi dialog exchange for frist 4 tabs ui/css/theme-default/base.css | 4 +++ ui/css/theme-default/button.css | 5 +++ ui/css/theme-default/repository-add.css | 4 +++ ui/css/theme-default/repository-edit.css | 6 ++-- ui/css/theme-default/template-edit.css | 4 +++ ui/css/theme-default/template_add.css | 5 +++ ui/js/src/kimchi.repository_add_main.js | 21 +++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 16 ++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 11 +++++++ ui/js/src/kimchi.storagepool_add_volume_main.js | 17 ++++++++++ ui/js/src/kimchi.template_add_main.js | 24 +++++++++++++++ ui/js/src/kimchi.template_edit_main.js | 12 ++++++++ ui/pages/guest-add.html.tmpl | 9 ++++-- ui/pages/report-add.html.tmpl | 1 + ui/pages/report-rename.html.tmpl | 1 + ui/pages/repository-add.html.tmpl | 18 +++++++---- ui/pages/repository-edit.html.tmpl | 6 ++-- ui/pages/storagepool-add-volume.html.tmpl | 14 ++++++--- ui/pages/storagepool-add.html.tmpl | 41 +++++++++++++++---------- ui/pages/template-add.html.tmpl | 9 ++++-- ui/pages/template-edit.html.tmpl | 6 +++- 21 files changed, 196 insertions(+), 38 deletions(-) -- 2.1.0

2 4

[PATCH 0/5] Exchange dialog of tab Host/Guests/Templates/Storage
by Wen Wang 02 Mar '15

02 Mar '15

Exchange dialog of tab Host/Guests/Templates/Storage with new kimchi UI Wen Wang (5): UI: Change host dialog UI: Exchange guests dialog style to new kimchi UI UI: Guest button fix UI: Exchange template dialog with new kimchi UI UI: Exchange storage dialog with new kimchi UI ui/css/theme-default/base.css | 2 +- ui/css/theme-default/button.css | 25 +++++----------- ui/css/theme-default/form.css | 10 +++++-- ui/css/theme-default/guest-edit.css | 28 +++++++++++------- ui/css/theme-default/report-add.css | 11 +++++-- ui/css/theme-default/report-rename.css | 14 ++++----- ui/css/theme-default/repository-add.css | 6 ++++ ui/css/theme-default/repository-edit.css | 24 +++++++-------- ui/css/theme-default/template_add.css | 4 +++ ui/css/theme-default/window.css | 49 +++++++------------------------ ui/js/src/kimchi.storagepool_add_main.js | 7 ++--- ui/pages/guest-add.html.tmpl | 12 ++++---- ui/pages/guest-edit.html.tmpl | 6 ++-- ui/pages/report-add.html.tmpl | 10 ++++--- ui/pages/report-rename.html.tmpl | 10 ++++--- ui/pages/repository-add.html.tmpl | 41 ++++++++++++++------------ ui/pages/repository-edit.html.tmpl | 8 +++-- ui/pages/storagepool-add-volume.html.tmpl | 10 +++---- ui/pages/storagepool-add.html.tmpl | 22 +++++++------- ui/pages/template-add.html.tmpl | 8 +++-- ui/pages/template-edit.html.tmpl | 4 +-- 21 files changed, 157 insertions(+), 154 deletions(-) -- 2.1.0

2 7

[PATCH] UI: Storage Grid View
by huoyuxin＠linux.vnet.ibm.com 27 Feb '15

27 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/storage.css | 161 +++++++------------------------------ ui/js/src/kimchi.storage_main.js | 21 ++++-- ui/pages/tabs/storage.html.tmpl | 72 +++++++++--------- 3 files changed, 82 insertions(+), 172 deletions(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index e0ab290..6231178 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -16,101 +16,29 @@ * limitations under the License. */ /* STORAGE */ -.handle { - width: 49px; +.storage { + margin: 5px; } -.storage-allocate-padding-user { - padding-right: 108px; -} -.storage-title { - font-size: 13px; - height: 18px; - padding: 10px; - color: #666; - float: left; - max-width: 85px; - overflow: hidden; - text-overflow: ellipsis; - font-weight: bold; - line-height: 18px; - white-space: nowrap; +.storage .grid-control { + height: 40px; + padding: 5px 0; } -.usage { - font-size: 13px; - height: 18px; - padding: 10px; - color: #666; +.storage .grid-control .filter { + width: 300px; + padding: 5px; float: right; - font-weight: bold; - line-height: 18px; -} - -.storage-text { - font-size: 12px; - height: 18px; - padding: 10px; - color: #999999; - font-weight: bold; - line-height: 18px; -} - -.list-storage { - margin: 10px; -} - -.list-storage .storage-li { - width: 1004px; - margin-top: 10px; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); - background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', - endColorstr='#e5e5e5', GradientType=0); - border: 1px solid #ccc; - color: #333; - -moz-border-top-left-radius: 8px; - -moz-border-top-right-radius: 8px; - -webkit-border-top-left-radius: 8px; - -webkit-border-top-right-radius: 8px; - -moz-border-bottom-left-radius: 8px; - -moz-border-bottom-right-radius: 8px; - -webkit-border-bottom-left-radius: 8px; - -webkit-border-bottom-right-radius: 8px; - border-top-left-radius: 8px; - border-top-right-radius: 8px; - border-bottom-left-radius: 8px; - border-bottom-right-radius: 8px; -} - -.list-storage .storage-li>* { - height: 25px; - display: table-cell; - vertical-align: middle; - position: relative; - border-left: 1px solid #ccc; - border-right: 1px solid #fff; -} - -.list-storage .storage-li>*:FIRST-CHILD { - border-left: none; } -.list-storage .storage-li>*:LAST-CHILD { - border-right: none; +.storage-allocate-padding-user { + padding-right: 108px; } -.list-storage .storage-li[data-stat="active"]:hover { - border: 1px solid rgb(11, 107, 173); - box-shadow: 0px 0px 5px rgb(11, 107, 173); - cursor: default; +.usage { + float: right; + margin-right: 30px; } .list-storage .storage-li>.guest-tile { @@ -152,62 +80,35 @@ } .storage-name { - width: 199px; + width: 15%; } .storage-state { - width: 51px; -} - -.storage-location { - width: 288px; + width: 10%; } .storage-type { - width: 98px; + width: 10%; } .storage-capacity { - width: 98px; + width: 10%; } .storage-allocate { - width: 98px; -} - - -.storage-button { - width: 108px; - text-align: center; -} - -.title-name { - width: 199px; -} - -.title-state { - width: 51px; -} - -.title-location { - width: 288px; + width: 10%; } -.title-type { - width: 98px; -} - -.title-capacity { - width: 98px; +.storage-location { + width: 30%; } -.title-allocate { - width: 98px; +.storage-button { + width: 9%; } - -.title-action { - width: 108px; +.handle { + width: 2%; } .status-dot { @@ -218,8 +119,8 @@ border-radius: 13px; box-shadow: 3px 3px 3px #FFFFFF, -3px -3px 3px #DDDDDD; height: 13px; - margin: 20px 18px; width: 13px; + margin-left: 10px; } .toolable { @@ -459,22 +360,22 @@ .list-storage .storage-li[data-stat="active"]>.handle>.arrow-down { background: url(../images/theme-default/arrow-down.png) no-repeat center center; - height: 52px; - width: 45px; + height: 18px; + width: 18px; } .list-storage .storage-li[data-stat="inactive"]>.handle>.arrow-down { background: url(../images/theme-default/arrow-down-disable.png) no-repeat center center; - height: 52px; - width: 45px; + height: 18px; + width: 18px; } .arrow-up { background: url(../images/theme-default/arrow-up.png) no-repeat center center; - height: 52px; - width: 45px; + height: 18px; + width: 18px; } .storage-icon { diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 9a45b65..64a132a 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -29,12 +29,18 @@ kimchi.doListStoragePools = function() { listHtml += kimchi.substitute(storageHtml, value); } }); + if($('#storageGrid').hasClass('grid')) + $('#storageGrid').grid('destroy'); $('#storagepoolsList').html(listHtml); if(kimchi.tabMode['storage'] === 'admin') { $('.storage-button').attr('style','display'); } else { $('.storage-allocate').addClass('storage-allocate-padding-user'); } + $('#storageGrid').grid({enableSorting: false}); + $('input', $('.grid-control', '.storage')).on('keyup', function(){ + $('#storageGrid').grid('filter', $(this).val()); + }); kimchi.storageBindClick(); } else { $('#storagepoolsList').html(''); @@ -169,18 +175,21 @@ kimchi.storageBindClick = function() { }); } - $('.storage-li').on('click', function(event) { + $('.row').on('click', function(event) { if (!$(event.target).parents().hasClass('bottom')) { if ($(this).data('stat') === 'active') { var that = $(this); var volumeDiv = $('#volume' + that.data('name')); - var slide = $(this).next('.volumes'); + var slide = $('.volumes', this); if (that.hasClass('in')) { + that.css('height','auto'); kimchi.doListVolumes(that); } else { - slide.slideUp('slow'); + slide.slideUp('slow', function(){ + that.css('height',''); + }); that.addClass('in'); - kimchi.changeArrow(that.children().last().children()); + kimchi.changeArrow($('.arrow-up', this)); } } } @@ -226,8 +235,8 @@ kimchi.doListVolumes = function(poolObj) { var volumeDiv = $('#volume' + poolName); $(volumeDiv).empty(); - var slide = poolObj.next('.volumes'); - var handleArrow = poolObj.children().last().children(); + var slide = $('.volumes', poolObj); + var handleArrow = $('.arrow-down', poolObj); kimchi.listStorageVolumes(poolName, function(result) { var listHtml = ''; diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index dbbaef9..320ec16 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -29,17 +29,19 @@ <a id="storage-pool-add" class="btn-tool" href="javascript:void(0);"><span class="icon add">+</span></a> </div> </div> -<div> - <div class="list-title"> - <li class="title-name">$_("Name")</li> - <li class="title-state" >$_("State")</li> - <li class="title-location">$_("Location")</li> - <li class="title-type">$_("Type")</li> - <li class="title-capacity">$_("Capacity")</li> - <li class="title-allocate">$_("Allocated")</li> - <li class="title-actions" style="display:none">$_("Actions")</li> +<div class='storage'> +<div class="grid-control"><input type="text" class="filter" placeholder="$_("Filter")"></div> +<div id='storageGrid'> + <div> + <span class="storage-name">$_("Name")</span> + <span class="storage-state" >$_("State")</span> + <span class="storage-type">$_("Type")</span> + <span class="storage-capacity">$_("Capacity")</span> + <span class="storage-allocate">$_("Allocated")</span> + <span class="storage-location">$_("Location")</span> </div> - <ul id="storagepoolsList" class="list-storage empty-when-logged-off"></ul> + <div id="storagepoolsList" class="list-storage empty-when-logged-off"></div> +</div> </div> <div id="logicalPoolExtend" title="$_("Device path")"> <p id="loading-info" class="text-help"> @@ -50,33 +52,32 @@ </div> </div> <script id="storageTmpl" type="html/text"> - <li id="{name}"> - <div class="storage-li in" data-name="{name}" data-stat="{state}"> - <div class="storage-name"> - <span class="storage-title" title="{name}">{name}</span> - <span class="storage-title usage">{usage}%</span> - </div> - <div class="storage-state"> + <div id="{name}" class="storage-li in" data-name="{name}" data-stat="{state}"> + <span class="storage-name" val="{name}{usage}%"> + <span title="{name}">{name}</span> + <span class="usage">{usage}%</span> + </span> + <span class="storage-state"> <div class="status-dot toolable active" data-state="{state}"> <label class="tooltip">$_("active")</label> </div> <div class="status-dot toolable inactive" data-state="{state}"> <label class="tooltip">$_("inactive")</label> </div> - </div> - <div class="storage-location"> - <div class="storage-text">{path}</div> - </div> - <div class="storage-type"> - <div class="storage-text">{type}</div> - </div> - <div class="storage-capacity"> - <div class="storage-text" data-type="{type}">{capacity}</div> - </div> - <div class="storage-allocate"> - <div class="storage-text" data-type="{type}">{allocated}</div> - </div> - <div class="bottom storage-button" style="display:none"> + </span> + <span class="storage-type" val="{type}"> + <div>{type}</div> + </span> + <span class="storage-capacity" val="{capacity}"> + <div data-type="{type}">{capacity}</div> + </span> + <span class="storage-allocate" val="{allocated}"> + <div data-type="{type}">{allocated}</div> + </span> + <span class="storage-location" val="{path}"> + <div>{path}</div> + </span> + <span class="bottom storage-button" style="display:none"> <div class="btn dropdown popable storage-action" data-state="{state}" data-type="{type}" data-name="{name}"> <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> @@ -87,16 +88,15 @@ <button class="button-big red pool-delete" data-stat="{state}" data-name="{name}"><span class="text">$_("Undefine")</span></button> </div> </div> - </div> - <div class="handle"> + </span> + <span class="handle"> <div class="arrow-down"></div> - </div> - </div> + </span> <div class="volumes"> <div id="volume{name}" class="volumeslist" data-name="{name}" ></div> <div class="clear"></div> </div> - </li> + </div> </script> <script id="volumeTmpl" type="html/text"> <div class="volume-box white-box" data-volume-name="{name}"> -- 1.7.1

3 2

[v2 0/3] UI: Grid View of Network Tab
by huoyuxin＠linux.vnet.ibm.com 27 Feb '15

27 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (3): UI: Update Framework Style UI: Update Grid Widget UI: Network Grid View ui/css/theme-default/datagrid.css | 11 +--- ui/css/theme-default/framework.css | 4 +- ui/css/theme-default/network.css | 83 ++++++++--------------------------- ui/css/theme-default/reset.css | 2 +- ui/js/src/kimchi.network.js | 14 ++++-- ui/js/widgets/grid.js | 28 ++++++++---- ui/pages/tabs/network.html.tmpl | 29 ++++++------ 7 files changed, 69 insertions(+), 102 deletions(-)

3 6

[PATCH 0/3] UI: Network Grid View
by huoyuxin＠linux.vnet.ibm.com 27 Feb '15

27 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (3): UI: Update Framework Style UI: Update Grid Widget UI: Network Grid View ui/css/theme-default/datagrid.css | 11 +--- ui/css/theme-default/framework.css | 4 +- ui/css/theme-default/network.css | 83 ++++++++--------------------------- ui/css/theme-default/reset.css | 2 +- ui/js/src/kimchi.network.js | 6 ++- ui/js/widgets/grid.js | 20 +++++---- ui/pages/tabs/network.html.tmpl | 29 ++++++------ 7 files changed, 56 insertions(+), 99 deletions(-)

2 5

[PATCH 00/11] Full patch of the rest widgets
by Wen Wang 26 Feb '15

26 Feb '15

Full patch of rest widgets. Wen Wang (11): UI: Add Kimchi message widget for new kimchi UI UI: Sample of message widget UI: Adding new widget of list UI: Sample of list widget UI Add widget button to new kimchi UI UI: Adding new widget of menu to kimchi new UI UI: Adding new textbox widget to new kimchi UI UI: Adding new radio widget of new kimchi UI UI: Adding new checkbox widget to new kimchi UI UI: Adding selectmenu widget for kimchi new UI UI: Sample of menu/button/radio/checkbox/seletmenu/textbox ui/css/theme-default/button-flat.css | 135 +++++++ ui/css/theme-default/checkbox-flat.css | 25 ++ ui/css/theme-default/list-flat.css | 83 ++++ ui/css/theme-default/menu-flat.css | 89 +++++ ui/css/theme-default/message-flat.css | 87 +++++ ui/css/theme-default/radio-flat.css | 30 ++ ui/css/theme-default/selectmenu-flat.css | 88 +++++ ui/css/theme-default/textbox-flat.css | 22 ++ ui/js/widgets/button-flat.js | 419 +++++++++++++++++++++ ui/js/widgets/checkbox-flat.js | 86 +++++ ui/js/widgets/list-flat.js | 76 ++++ ui/js/widgets/menu-flat.js | 114 ++++++ ui/js/widgets/message-flat.js | 97 +++++ ui/js/widgets/radio-flat.js | 86 +++++ ui/js/widgets/samples/list-sample.html | 27 ++ ...u-button-radio-checkbox-text-select-sample.html | 83 ++++ ui/js/widgets/samples/message-sample.html | 30 ++ ui/js/widgets/selectmenu-flat.js | 130 +++++++ ui/js/widgets/textbox-flat.js | 39 ++ 19 files changed, 1746 insertions(+) create mode 100755 ui/css/theme-default/button-flat.css create mode 100644 ui/css/theme-default/checkbox-flat.css create mode 100644 ui/css/theme-default/list-flat.css create mode 100644 ui/css/theme-default/menu-flat.css create mode 100644 ui/css/theme-default/message-flat.css create mode 100644 ui/css/theme-default/radio-flat.css create mode 100644 ui/css/theme-default/selectmenu-flat.css create mode 100644 ui/css/theme-default/textbox-flat.css create mode 100755 ui/js/widgets/button-flat.js create mode 100644 ui/js/widgets/checkbox-flat.js create mode 100644 ui/js/widgets/list-flat.js create mode 100644 ui/js/widgets/menu-flat.js create mode 100644 ui/js/widgets/message-flat.js create mode 100644 ui/js/widgets/radio-flat.js create mode 100644 ui/js/widgets/samples/list-sample.html create mode 100644 ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html create mode 100644 ui/js/widgets/samples/message-sample.html create mode 100644 ui/js/widgets/selectmenu-flat.js create mode 100644 ui/js/widgets/textbox-flat.js -- 2.1.0

2 13

[PATCH 0/5] Create VMs Asynchronously
by Christy Perez 26 Feb '15

26 Feb '15

If a guest has a large disk, and uses a filesystem that requires preallocation, it can take several minutes to create a VM. During that time, kimchi is tied up by the VM creation. This patch changes the VMs Collection to be an AsyncCollection. Another change required for this was to create a more granular way to query tasks. Currently it is not possible (using the API) to query tasks for the same collection or resource type that may have different operations. For example, VM cloning is also an asynchronous operation. For the guests tab, the UI was querying all running tasks and displaying them with the Cloning label. This picked up VMs that were being created as well. For more information about how the tasks can be queried, see the updated API doc and the UI change. Christy Perez (5): Granular Task Queries: Backend Granular task queries test updates More Granular Task Queries: UI Create guests asynchronously: Backend Async vm creation test updates docs/API.md | 14 +++++++ src/kimchi/asynctask.py | 6 ++- src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 7 ++-- src/kimchi/model/debugreports.py | 4 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagevolumes.py | 7 ++-- src/kimchi/model/tasks.py | 1 - src/kimchi/model/vms.py | 32 ++++++++++++--- src/kimchi/model/vmsnapshots.py | 3 +- src/kimchi/utils.py | 4 +- tests/test_authorization.py | 23 ++++++----- tests/test_mockmodel.py | 15 +++++-- tests/test_model.py | 62 ++++++++++++++++++---------- tests/test_rest.py | 82 ++++++++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 2 +- 17 files changed, 191 insertions(+), 81 deletions(-) -- 2.1.0

2 9

[PATCH] Set a common message to KCHGRD6002M
by Aline Manera 26 Feb '15

26 Feb '15

The message KCHGRD6002M is used on grid for packages update and repositories managment. So it needs to be a common message. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- po/de_DE.po | 8 ++------ po/en_US.po | 4 ++-- po/es_ES.po | 7 ++----- po/fr_FR.po | 10 ++-------- po/it_IT.po | 7 ++----- po/ja_JP.po | 8 ++------ po/kimchi.pot | 4 ++-- po/ko_KR.po | 7 ++----- po/pt_BR.po | 9 +++------ po/ru_RU.po | 7 ++----- po/zh_CN.po | 9 +++------ po/zh_TW.po | 4 ++-- ui/pages/i18n.json.tmpl | 2 +- 13 files changed, 27 insertions(+), 59 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index f271b78..6a3b7df 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -1455,7 +1455,7 @@ msgstr "Warnung" msgid "Loading..." msgstr "Wird geladen..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2212,7 +2212,3 @@ msgstr "Zuordnung:" msgid "No templates found." msgstr "Keine Vorlagen gefunden." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "" -#~ "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" diff --git a/po/en_US.po b/po/en_US.po index 5377aec..6efb22c 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -1327,7 +1327,7 @@ msgstr "" msgid "Loading..." msgstr "" -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" diff --git a/po/es_ES.po b/po/es_ES.po index 1e95992..e3c567f 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -1474,7 +1474,7 @@ msgstr "Aviso" msgid "Loading..." msgstr "Cargando..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2231,6 +2231,3 @@ msgstr "Asignado:" msgid "No templates found." msgstr "No se han encontrado plantillas." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" diff --git a/po/fr_FR.po b/po/fr_FR.po index 1ee9bb9..b27ec76 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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/" @@ -1488,9 +1488,8 @@ msgstr "Avertissement" msgid "Loading..." msgstr "Chargement en cours..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" -"Une erreur est survenue lors de la vérification des mises-à-jour de paquets." msgid "Retry" msgstr "Essayer à nouveau" @@ -2254,8 +2253,3 @@ msgstr "Allocation" msgid "No templates found." msgstr "Aucun modèle trouvé." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "" -#~ "Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " -#~ "%(resource)s" diff --git a/po/it_IT.po b/po/it_IT.po index b5e2866..81e49f8 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -1443,7 +1443,7 @@ msgstr "Avvertenza" msgid "Loading..." msgstr "Caricamento in corso..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2199,6 +2199,3 @@ msgstr "Allocazione:" msgid "No templates found." msgstr "Nessun modello trovato." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" diff --git a/po/ja_JP.po b/po/ja_JP.po index e81cddb..e29de8c 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -1448,7 +1448,7 @@ msgstr "警告" msgid "Loading..." msgstr "ロードしています..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2193,7 +2193,3 @@ msgstr "割り振り:" msgid "No templates found." msgstr "テンプレートが見つかりません。" - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "" -#~ "パラメーター %(params)s を %(resource)s で更新することは許可されません" diff --git a/po/kimchi.pot b/po/kimchi.pot index cba1e2b..ee30a71 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -1327,7 +1327,7 @@ msgstr "" msgid "Loading..." msgstr "" -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" diff --git a/po/ko_KR.po b/po/ko_KR.po index 1da6a20..53fb4bf 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -1380,7 +1380,7 @@ msgstr "경고" msgid "Loading..." msgstr "로드 중..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2116,6 +2116,3 @@ msgstr "할당:" msgid "No templates found." msgstr "템플리트가 없습니다." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" diff --git a/po/pt_BR.po b/po/pt_BR.po index 1159157..0514b62 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2014-12-02 12:15+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -1502,8 +1502,8 @@ msgstr "Aviso" msgid "Loading..." msgstr "Carregando..." -msgid "An error occurred while checking for packages update." -msgstr "Um erro ocorreu ao verificar port atualização de pacotes." +msgid "An error occurred while retrieving system information." +msgstr "" msgid "Retry" msgstr "Tentar novamente" @@ -2264,6 +2264,3 @@ msgstr "Alocação" msgid "No templates found." msgstr "Nenhum modelo encontrado." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" diff --git a/po/ru_RU.po b/po/ru_RU.po index ce80d38..389c853 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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/" @@ -1381,7 +1381,7 @@ msgstr "Предупреждение" msgid "Loading..." msgstr "Загружается..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2120,6 +2120,3 @@ msgstr "Выделение ресурсов:" msgid "No templates found." msgstr "Не найдены шаблоны." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "Обновление параметров %(params)s запрещено в %(resource)s" diff --git a/po/zh_CN.po b/po/zh_CN.po index d739098..fa9e5d2 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1361,8 +1361,8 @@ msgstr "警告" msgid "Loading..." msgstr "正在加载..." -msgid "An error occurred while checking for packages update." -msgstr "查找软件包更新时出现错误。" +msgid "An error occurred while retrieving system information." +msgstr "" msgid "Retry" msgstr "重试" @@ -2084,6 +2084,3 @@ msgstr "分配" msgid "No templates found." msgstr "没有发现模板" - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "不允许更新%(resource)s的%(params)s参数。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 1d62ece..a41a046 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -1332,7 +1332,7 @@ msgstr "警告" msgid "Loading..." msgstr "正在載入..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index b170d26..8e45b51 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -50,7 +50,7 @@ "KCHAPI6008M": "$_("Creating...")", "KCHGRD6001M": "$_("Loading...")", - "KCHGRD6002M": "$_("An error occurred while checking for packages update.")", + "KCHGRD6002M": "$_("An error occurred while retrieving system information.")", "KCHGRD6003M": "$_("Retry")", "KCHGRD6004M": "$_("Detailed message:")", -- 2.1.0

3 3

[PATCH] Bug fix: Properly reload grid content
by Aline Manera 26 Feb '15

26 Feb '15

The grid reload function requires a data argument related to the grid object. It is passed to the handler in the event.data property each time an event is trigered. So, properly get the grid object on event.data property to do the reload. To test this, you can manually lock YUM/apt on system by running a system update command and then verify on Kimchi that the packages update and repositories information was not loaded. Stop the system update you have manually started and click on "Retry" button. Without this patch you will get a Javascript error: 'grid' is undefined. And with that the content will be properly reloaded. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index eccac1c..6fed753 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -503,7 +503,7 @@ kimchi.widget.Grid.prototype = (function() { $('.retry-button', domNode).on('click', { grid: this }, function(event) { - grid.reload(); + event.data.grid.reload(); }); }; -- 2.1.0

2 2

[PATCH] Bug fix: Properly raise authenticate error when login fails
by Aline Manera 26 Feb '15

26 Feb '15

Commit 3e25bdfc moved the PAM authentication to a sub process to avoid file handler leak. But on any error it must be raised in the main process, otherwise it will not reach the user. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index dee4c37..1a52185 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -30,13 +30,11 @@ import termios import time import urllib2 - from kimchi import template from kimchi.config import config from kimchi.exception import InvalidOperation, OperationFailed from kimchi.utils import get_all_tabs, run_command - USER_NAME = 'username' USER_GROUPS = 'groups' USER_ROLES = 'roles' @@ -164,25 +162,26 @@ class PAMUser(User): return None return resp - result.value = False auth = PAM.pam() auth.start(service) auth.set_item(PAM.PAM_USER, username) auth.set_item(PAM.PAM_CONV, _pam_conv) try: auth.authenticate() + result.value = 0 except PAM.error, (resp, code): - msg_args = {'username': username, 'code': code} - raise OperationFailed("KCHAUTH0001E", msg_args) - - result.value = True + result.value = code result = multiprocessing.Value('i', 0, lock=False) p = multiprocessing.Process(target=_auth, args=(result, )) p.start() p.join() - return result.value + if result.value != 0: + msg_args = {'username': username, 'code': result.value} + raise OperationFailed("KCHAUTH0001E", msg_args) + + return True class LDAPUser(User): -- 2.1.0

2 2

[PATCH] Issue #587: Man page submission for kimchid
by frediz＠linux.vnet.ibm.com 26 Feb '15

26 Feb '15

From: Frederic Bonnard <frediz(a)linux.vnet.ibm.com> Adding a manpage and handling it in Makefile.am --- Makefile.am | 2 ++ docs/kimchid.8 | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 docs/kimchid.8 diff --git a/Makefile.am b/Makefile.am index 36e12d0..0720277 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,8 @@ SUBDIRS = src ui docs contrib tests po config plugins +man_MANS = docs/kimchid.8 + AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = --install -I m4 diff --git a/docs/kimchid.8 b/docs/kimchid.8 new file mode 100644 index 0000000..9591b29 --- /dev/null +++ b/docs/kimchid.8 @@ -0,0 +1,100 @@ +.TH KIMCHI 1 "February 05, 2015" "Version 1.4.0" "Kimchi Manual" +.SH NAME Kimchi \- HTML5 based management tool for KVM +.SH SYNOPSIS +.B kimchid +[\fB-h\fP|\fB--help\fP] [\fB--host\fP \fIhost\fP] [\fB--port\fP \fIport\fP] +[\fB--ssl-port\fP \fIssl_port\fP] [\fB--cherrypy_port\fP \fIcherrypy_port\fP] +[\fB--log-level\fP \fIlog_level\fP] [\fB--access-log\fP \fIaccess_log\fP] +[\fB--error-log\fP \fIerror_log\fP] [\fB--environment\fP \fIenvironment\fP] +[\fB--federation\fP \fIfederation\fP] [\fB--test\fP] +.SH DESCRIPTION +\fBKimchi\fP is an HTML5 based management tool for KVM. It is designed to make +it as easy as possible to get started with KVM and create your first guest. +\fBkimchid\fP launches the daemon on the hypervisor host which manages KVM guests through +libvirt. The management interface is accessed over the web using a browser that +supports HTML5. +.SH OPTIONS +The following options are supported: +.TP +\fB-h\fP , \fB--help\fP +Show the help message and exit +.TP +\fB--host\fP +Specify the hostname to listen on +.TP +\fB--port\fP +Specify the port to listen on (default \fI8000\fP) +.TP +\fB--ssl-port\fP +Specify the port to enable SSL (default \fI8001\fP) +.TP +\fB--cherrypy_port\fP +Specify the Cherrypy server port (default \fI8010\fP) +.TP +\fB--log-level\fP +Specify the log level +.TP +\fB--access-log\fP +Specify the access log file +.TP +\fB--environment\fP +Specify the running environment of kimchi server +.TP +\fB--federation\fP +Register and discover Kimchi peers in the same network using openSLP. Check +README-federation for more details. +.TP +\fB--test\fP +Run server in mock model +.SH LICENCE +.br +Kimchi is distributed pursuant to the terms of two different licenses. +The user interface (located in ui/ in this distribution) is governed by +the Apache License version 2.0. + +Except the code under ui/spice-html5 which is imported from spice-html5 project +(http://cgit.freedesktop.org/spice/spice-html5) and under ui/libs which is +imported from JQuery UI (http://jqueryui.com) + +The rest of this distribution is governed by the GNU Lesser General Public +License version 3. + +See COPYING.LGPL and COPYING.ASL2. +.SH BUGS +Current bugs can be found here : https://github.com/kimchi-project/kimchi/issues +.br +If you find any, please open an issue : https://github.com/kimchi-project/kimchi/issues/new +.SH AUTHOR +\fBAdam King\fP <rak(a)linux.vnet.ibm.com>, +\fBAdam Litke\fP <agl(a)linux.vnet.ibm.com>, +\fBAdriano Botega\fP <abotega(a)linux.vnet.ibm.com>, +\fBAlexandre Tanaka Hirata\fP <hirata(a)linux.vnet.ibm.com>, +\fBAline Manera\fP <alinefm(a)br.ibm.com>, +\fBapporc\fP <appleorchard2000(a)gmail.com>, +\fBAnthony Liguori\fP <aliguori(a)us.ibm.com>, +\fBBing Bu Cao\fP <mars(a)linux.vnet.ibm.com>, +\fBChristy Perez\fP <christy(a)linux.vnet.ibm.com>, +\fBCole Robinson\fP <crobinso(a)redhat.com>, +\fBCr��stian Viana\fP <vianac(a)linux.vnet.ibm.com>, +\fBDaniel H Barboza\fP <danielhb(a)linux.vnet.ibm.com>, +\fBEduardo Elias Ferreira\fP <edusf(a)linux.vnet.ibm.com>, +\fBEli Qiao(Li Yong Qiao)\fP <taget(a)linux.vnet.ibm.com>, +\fBHongliang Wang\fP <hlwang(a)linux.vnet.ibm.com>, +\fBLeonardo Garcia\fP <lagarcia(a)br.ibm.com>, +\fBLise Noble\fP <lwnoble(a)us.ibm.com>, +\fBMalcolm Yu\fP <minghaoyusombie(a)gmail.com>, +\fBMark Wu\fP <wudxw(a)linux.vnet.ibm.com>, +\fBMei Na Zhou\fP <zhoumein(a)linux.vnet.ibm.com>, +\fBPaulo Vital\fP <pvital(a)linux.vnet.ibm.com>, +\fBPradeep K Surisetty\fP <psuriset(a)linux.vnet.ibm.com>, +\fBRamon Medeiros\fP <ramonn(a)linux.vnet.ibm.com>, +\fBRodrigo Trujilo\fP <rodrigo.trujillo(a)linux.vnet.ibm.com>, +\fBRoyce Lv\fP <lvroyce(a)linux.vnet.ibm.com>, +\fBShaoHe Feng\fP <shaohef(a)linux.vnet.ibm.com>, +\fBShu Ming\fP <shuming(a)linux.vnet.ibm.com>, +\fBToby Allsopp\fP <toby(a)MI6.GEN.NZ>, +\fBTony Breeds\fP <tonyb(a)au1.ibm.com>, +\fBXin BJ Ding\fP <xinding(a)cn.ibm.com>, +\fBYu Xin Huo\fP <huoyuxin(a)linux.vnet.ibm.com>, +\fBZhou Zheng Sheng\fP <zhshzhou(a)linux.vnet.ibm.com>, +.SH SEE ALSO -- 1.9.1

4 5

[PATCH 0/5] Create VMs Asynchronously
by Christy Perez 25 Feb '15

25 Feb '15

If a guest has a large disk, and uses a filesystem that requires preallocation, it can take several minutes to create a VM. During that time, kimchi is tied up by the VM creation. This patch changes the VMs Collection to be an AsyncCollection. Another change required for this was to create a more granular way to query tasks. Currently it is not possible (using the API) to query tasks for the same collection or resource type that may have different operations. For example, VM cloning is also an asynchronous operation. For the guests tab, the UI was querying all running tasks and displaying them with the Cloning label. This picked up VMs that were being created as well. For more information about how the tasks can be queried, see the updated API doc and the UI change. Christy Perez (5): Granular Task Queries: Backend Granular task queries test updates More Granular Task Queries: UI Create guests asynchronously: Backend Async vm creation test updates docs/API.md | 14 +++++++ src/kimchi/asynctask.py | 6 ++- src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 7 ++-- src/kimchi/model/debugreports.py | 4 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagevolumes.py | 7 ++-- src/kimchi/model/tasks.py | 1 - src/kimchi/model/vms.py | 33 ++++++++++++--- src/kimchi/model/vmsnapshots.py | 3 +- src/kimchi/utils.py | 4 +- tests/test_authorization.py | 23 ++++++----- tests/test_mockmodel.py | 15 +++++-- tests/test_model.py | 62 ++++++++++++++++++---------- tests/test_rest.py | 82 ++++++++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 2 +- 17 files changed, 192 insertions(+), 81 deletions(-) -- 2.1.0

1 6

[PATCH v4] Fix grammar for selected messages
by Christy Perez 25 Feb '15

25 Feb '15

There were two things I saw that needed to be fixed: - The ISO scan warning, "It may take long time," and - The interface error for an exsiting interface, "The interface already exist." Fixed these and corrected all the translation strings for other changes. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/de_DE.po | 123 ++++++++++++++++++++++++---------------------- po/en_US.po | 94 +++++++++++++++++++----------------- po/es_ES.po | 124 ++++++++++++++++++++++++----------------------- po/fr_FR.po | 126 +++++++++++++++++++++++++----------------------- po/it_IT.po | 124 ++++++++++++++++++++++++----------------------- po/ja_JP.po | 121 +++++++++++++++++++++++----------------------- po/kimchi.pot | 95 ++++++++++++++++++------------------ po/ko_KR.po | 120 ++++++++++++++++++++++----------------------- po/pt_BR.po | 124 ++++++++++++++++++++++++----------------------- po/ru_RU.po | 120 ++++++++++++++++++++++----------------------- po/zh_CN.po | 30 +++++++----- po/zh_TW.po | 120 +++++++++++++++++++++++---------------------- ui/pages/i18n.json.tmpl | 2 +- 13 files changed, 690 insertions(+), 633 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 5116d1f..6c4a089 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s implementiert keine Aktualisierungsmethode" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Erstellen ist nicht zulässig für %(resource)s" @@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -801,6 +801,9 @@ msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Es konnte keine freie IP-Adresse für Netz '%(name)s' gefunden werden" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "Netzname muss eine Zeichenfolge sein" @@ -823,19 +826,19 @@ msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Netz %(name)s konnte nicht gelöscht werden. Es sind einige virtuellen " -"Maschinen und/oder Vorlagen mit diesem Netz verknüpft." +"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen " +"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" "Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen " -"Maschinen und/oder Vorlagen mit diesem Netz verknüpft." +"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1334,36 +1337,6 @@ msgstr "Abbrechen" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" - -msgid "Device Type" -msgstr "Einheitentyp" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt." - -msgid "Storage Pool" -msgstr "Speicherpool" - -msgid "Storage pool which volume located in" -msgstr "Speicherpoolpfad muss eine Zeichenfolge sein" - -msgid "Storage Volume" -msgstr "Speicherpoolname" - -msgid "Storage volume to be attached" -msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" - -msgid "File Path" -msgstr "Dateipfad" - -msgid "The ISO file path in the server for CDROM." -msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." - -msgid "Attach" -msgstr "Anhängen" - msgid "Cloning" msgstr "" @@ -1394,6 +1367,36 @@ msgstr "Herunterfahren" msgid "Delete" msgstr "Löschen" +msgid "Add a Storage Device to VM" +msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" + +msgid "Device Type" +msgstr "Einheitentyp" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt." + +msgid "Storage Pool" +msgstr "Speicherpool" + +msgid "Storage pool which volume located in" +msgstr "Speicherpoolpfad muss eine Zeichenfolge sein" + +msgid "Storage Volume" +msgstr "Speicherpoolname" + +msgid "Storage volume to be attached" +msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" + +msgid "File Path" +msgstr "Dateipfad" + +msgid "The ISO file path in the server for CDROM." +msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." + +msgid "Attach" +msgstr "Anhängen" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist " @@ -1466,7 +1469,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Dies ist keine gültige ISO-Datei." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Dies wird einige Zeit dauern. Möchten Sie fortfahren?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1920,21 +1923,6 @@ msgstr "Ja" msgid "No" msgstr "Nein" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Neuen Speicherpool definieren" @@ -2013,6 +2001,21 @@ msgstr "SCSI-Adapter" msgid "Please, wait..." msgstr "Bitte warten..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Vorlage hinzufügen" @@ -2208,3 +2211,7 @@ msgstr "Zuordnung:" msgid "No templates found." msgstr "Keine Vorlagen gefunden." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" diff --git a/po/en_US.po b/po/en_US.po index 05ca48a..5e66487 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "" @@ -292,6 +288,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -711,6 +711,10 @@ msgstr "" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "" +#, python-format +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "" @@ -731,14 +735,14 @@ msgstr "" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" #, python-format @@ -1210,64 +1214,64 @@ msgstr "" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" +msgid "Cloning" msgstr "" -msgid "Device Type" +msgid "Start" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Reset" msgstr "" -msgid "Storage Pool" +msgid "Power Off" msgstr "" -msgid "Storage pool which volume located in" +msgid "Actions" msgstr "" -msgid "Storage Volume" +msgid "Connect" msgstr "" -msgid "Storage volume to be attached" +msgid "Clone" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" -msgid "Cloning" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Start" +msgid "Device Type" msgstr "" -msgid "Reset" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Power Off" +msgid "Storage Pool" msgstr "" -msgid "Actions" +msgid "Storage pool which volume located in" msgstr "" -msgid "Connect" +msgid "Storage Volume" msgstr "" -msgid "Clone" +msgid "Storage volume to be attached" msgstr "" -msgid "Edit" +msgid "File Path" msgstr "" -msgid "Shut Down" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Delete" +msgid "Attach" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1338,7 +1342,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" @@ -1761,21 +1765,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "" @@ -1846,6 +1835,21 @@ msgstr "" msgid "Please, wait..." msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 573dc03..4816918 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s no implementa método de actualización" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Crear no está permitido para %(resource)s" @@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -810,6 +810,9 @@ msgstr "No se puede crear la red %(name)s. Detalles: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "No se puede encontrar una dirección IP libre para la red '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "La interfaz %(iface)s ya existe" + msgid "Network name must be a string" msgstr "El nombre de red debe ser una serie" @@ -832,19 +835,19 @@ msgstr "Especifique el nombre y el tipo para crear una red" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales y/o " -"plantillas enlazadas a esta red." +"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales %(vms)s " +"y/o plantillas enlazadas a esta red." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales y/o " -"plantillas enlazadas a esta red." +"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales " +"%(vms)s y/o plantillas enlazadas a esta red." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1352,36 +1355,6 @@ msgstr "Cancelar" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Añadir un dispositivo de almacenamiento a VM" - -msgid "Device Type" -msgstr "Tipo de dispositivo" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"." - -msgid "Storage Pool" -msgstr "Agrupación de almacenamiento" - -msgid "Storage pool which volume located in" -msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie" - -msgid "Storage Volume" -msgstr "Nombre de agrupación de almacenamiento" - -msgid "Storage volume to be attached" -msgstr "El nombre de volumen de almacenamiento debe ser una serie" - -msgid "File Path" -msgstr "Vía de acceso de archivo" - -msgid "The ISO file path in the server for CDROM." -msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." - -msgid "Attach" -msgstr "Conectar" - msgid "Cloning" msgstr "" @@ -1412,6 +1385,36 @@ msgstr "Concluir" msgid "Delete" msgstr "Suprimir" +msgid "Add a Storage Device to VM" +msgstr "Añadir un dispositivo de almacenamiento a VM" + +msgid "Device Type" +msgstr "Tipo de dispositivo" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"." + +msgid "Storage Pool" +msgstr "Agrupación de almacenamiento" + +msgid "Storage pool which volume located in" +msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie" + +msgid "Storage Volume" +msgstr "Nombre de agrupación de almacenamiento" + +msgid "Storage volume to be attached" +msgstr "El nombre de volumen de almacenamiento debe ser una serie" + +msgid "File Path" +msgstr "Vía de acceso de archivo" + +msgid "The ISO file path in the server for CDROM." +msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." + +msgid "Attach" +msgstr "Conectar" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "El nombre de usuario o contraseña que ha especificado es incorrecto. Por " @@ -1485,7 +1488,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "No es un archivo ISO válido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Tardará mucho tiempo. ¿Desea continuar?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1939,21 +1942,6 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Definir una agrupación de almacenamiento nueva" @@ -2030,6 +2018,21 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, espere..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Añadir plantilla" @@ -2227,3 +2230,6 @@ msgstr "Asignado:" msgid "No templates found." msgstr "No se han encontrado plantillas." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" diff --git a/po/fr_FR.po b/po/fr_FR.po index 715d612..3d49ca3 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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/" @@ -30,12 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s n'implémente pas de méthode de mise à jour" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" -"Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " -"%(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "La création n'est pas autorisée pour %(resource)s" @@ -329,6 +323,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -821,6 +819,9 @@ msgstr "Impossible de créer le réseau %(name)s. Détails: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Impossible de trouver une adresse IP libre pour le réseau '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "L'interface %(iface)s existe déjà" + msgid "Network name must be a string" msgstr "Le nom de réseau doit être une chaîne de caractères" @@ -843,19 +844,19 @@ msgstr "Spécifiez un nom et un type pour créer un réseau" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" "Impossible de supprimer le réseau %(name)s. Il y a des machines virtuelles " -"et/ou des modèles liés à ce réseau. " +"%(vms)s et/ou des modèles liés à ce réseau. " #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles et/" -"ou des modèles liés à ce réseau. " +"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles" +"%(vms)s et/ou des modèles liés à ce réseau. " #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1367,6 +1368,36 @@ msgstr "Annuler" msgid "revert" msgstr "" +msgid "Cloning" +msgstr "" + +msgid "Start" +msgstr "Démarrer" + +msgid "Reset" +msgstr "Réinitialiser" + +msgid "Power Off" +msgstr "Mettre hors tension" + +msgid "Actions" +msgstr "Actions" + +msgid "Connect" +msgstr "Connecter" + +msgid "Clone" +msgstr "Cloner" + +msgid "Edit" +msgstr "Éditer" + +msgid "Shut Down" +msgstr "Éteindre" + +msgid "Delete" +msgstr "Supprimer" + msgid "Add a Storage Device to VM" msgstr "Ajouter un Périphérique de Stockage à la VM" @@ -1398,36 +1429,6 @@ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM." msgid "Attach" msgstr "Attacher" -msgid "Cloning" -msgstr "" - -msgid "Start" -msgstr "Démarrer" - -msgid "Reset" -msgstr "Réinitialiser" - -msgid "Power Off" -msgstr "Mettre hors tension" - -msgid "Actions" -msgstr "Actions" - -msgid "Connect" -msgstr "Connecter" - -msgid "Clone" -msgstr "Cloner" - -msgid "Edit" -msgstr "Éditer" - -msgid "Shut Down" -msgstr "Éteindre" - -msgid "Delete" -msgstr "Supprimer" - msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. " @@ -1502,7 +1503,7 @@ msgstr "Aucune ISO détectée" msgid "This is not a valid ISO file." msgstr "Ce n'est pas un fichier ISO valide." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Cela va prendre un long moment. Voulez-vous continuer ?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1964,21 +1965,6 @@ msgstr "Oui" msgid "No" msgstr "Non" -msgid "Add a Volume to Storage Pool" -msgstr "iAjouter un Volume au Pool de Stockage" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "Saisir une URL distante ici" - -msgid "Upload a file" -msgstr "Charger un fichier" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Définir un Nouveau Pool de Stockage" @@ -2057,6 +2043,21 @@ msgstr "Adaptateur SCSI" msgid "Please, wait..." msgstr "Veuillez patienter..." +msgid "Add a Volume to Storage Pool" +msgstr "iAjouter un Volume au Pool de Stockage" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "Saisir une URL distante ici" + +msgid "Upload a file" +msgstr "Charger un fichier" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Ajouter un Modèle" @@ -2252,3 +2253,8 @@ msgstr "Allocation" msgid "No templates found." msgstr "Aucun modèle trouvé." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " +#~ "%(resource)s" diff --git a/po/it_IT.po b/po/it_IT.po index 1746bed..1b810db 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s non implementa il metodo di aggiornamento" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Creazione non consentita per %(resource)s" @@ -311,6 +307,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -783,6 +783,9 @@ msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "L'interfaccia %(iface)s già esistente." + msgid "Network name must be a string" msgstr "Il nome della rete deve essere una stringa" @@ -805,19 +808,19 @@ msgstr "Specificare nome e tipo per creare una rete" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali e/o " -"modelli collegati a tale rete." +"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali " +"%(vms)s e/o modelli collegati a tale rete." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie/" -"o modelli collegati a tale rete." +"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie " +"%(vms)s e/o modelli collegati a tale rete." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1321,36 +1324,6 @@ msgstr "Annulla" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Aggiungi un dispositivo di memoria alla VM" - -msgid "Device Type" -msgstr "Tipo dispositivo" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"." - -msgid "Storage Pool" -msgstr "Pool di memoria" - -msgid "Storage pool which volume located in" -msgstr "Il percorso del pool di memoria deve essere una stringa" - -msgid "Storage Volume" -msgstr "Nome pool di memoria" - -msgid "Storage volume to be attached" -msgstr "Il nome del volume di memoria deve essere una stringa" - -msgid "File Path" -msgstr "Percorso file" - -msgid "The ISO file path in the server for CDROM." -msgstr "Il percorso file ISO nel server per CDROM." - -msgid "Attach" -msgstr "Allega" - msgid "Cloning" msgstr "" @@ -1381,6 +1354,36 @@ msgstr "Arresta" msgid "Delete" msgstr "Elimina" +msgid "Add a Storage Device to VM" +msgstr "Aggiungi un dispositivo di memoria alla VM" + +msgid "Device Type" +msgstr "Tipo dispositivo" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"." + +msgid "Storage Pool" +msgstr "Pool di memoria" + +msgid "Storage pool which volume located in" +msgstr "Il percorso del pool di memoria deve essere una stringa" + +msgid "Storage Volume" +msgstr "Nome pool di memoria" + +msgid "Storage volume to be attached" +msgstr "Il nome del volume di memoria deve essere una stringa" + +msgid "File Path" +msgstr "Percorso file" + +msgid "The ISO file path in the server for CDROM." +msgstr "Il percorso file ISO nel server per CDROM." + +msgid "Attach" +msgstr "Allega" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " @@ -1454,7 +1457,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Non è un file ISO valido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Richiederà molto tempo. Continuare?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1906,21 +1909,6 @@ msgstr "Sì" msgid "No" msgstr "No" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Definisci un nuovo pool di memoria" @@ -2000,6 +1988,21 @@ msgstr "Adattatore SCSI" msgid "Please, wait..." msgstr "Attendere..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Aggiungi modello" @@ -2195,3 +2198,6 @@ msgstr "Allocazione:" msgid "No templates found." msgstr "Nessun modello trovato." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" diff --git a/po/ja_JP.po b/po/ja_JP.po index f9fe5ee..c04ea0c 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s は更新メソッドを実装していません" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "パラメーター %(params)s を %(resource)s で更新することは許可されません" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "%(resource)s の作成は許可されません" @@ -308,6 +304,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -799,6 +799,9 @@ msgstr "ネットワーク %(name)s を作成できません。詳細: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "ネットワーク「%(name)s」のフリー IP アドレスが見つかりません。" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "ネットワーク名はストリングでなければなりません" @@ -821,19 +824,15 @@ msgstr "ネットワークを作成するには、名前とタイプを指定し #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"ネットワーク %(name)s を削除できません。いくつかの仮想マシン/テンプレートが、" -"このネットワークにリンクしています。" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"ネットワーク %(name)s を非アクティブにできません。いくつかの仮想マシン/テンプ" -"レートが、このネットワークにリンクしています。" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1333,36 +1332,6 @@ msgstr "取消" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "VM にストレージ・デバイスを追加" - -msgid "Device Type" -msgstr "デバイス・タイプ" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。" - -msgid "Storage Pool" -msgstr "ストレージ・プール" - -msgid "Storage pool which volume located in" -msgstr "ストレージ・プール・パスはストリングでなければなりません" - -msgid "Storage Volume" -msgstr "ストレージ・プール名" - -msgid "Storage volume to be attached" -msgstr "ストレージ・ボリューム名はストリングでなければなりません" - -msgid "File Path" -msgstr "ファイル・パス" - -msgid "The ISO file path in the server for CDROM." -msgstr "サーバー内での CDROM の ISO ファイル・パス。" - -msgid "Attach" -msgstr "接続" - msgid "Cloning" msgstr "" @@ -1393,6 +1362,36 @@ msgstr "シャットダウン" msgid "Delete" msgstr "削除" +msgid "Add a Storage Device to VM" +msgstr "VM にストレージ・デバイスを追加" + +msgid "Device Type" +msgstr "デバイス・タイプ" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。" + +msgid "Storage Pool" +msgstr "ストレージ・プール" + +msgid "Storage pool which volume located in" +msgstr "ストレージ・プール・パスはストリングでなければなりません" + +msgid "Storage Volume" +msgstr "ストレージ・プール名" + +msgid "Storage volume to be attached" +msgstr "ストレージ・ボリューム名はストリングでなければなりません" + +msgid "File Path" +msgstr "ファイル・パス" + +msgid "The ISO file path in the server for CDROM." +msgstr "サーバー内での CDROM の ISO ファイル・パス。" + +msgid "Attach" +msgstr "接続" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" @@ -1463,7 +1462,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "有効な ISO ファイルではありません。" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "しばらく時間がかかることがあります。続行しますか?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1907,21 +1906,6 @@ msgstr " はい" msgid "No" msgstr " いいえ" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "新規ストレージ・プールの定義" @@ -1999,6 +1983,21 @@ msgstr "SCSI アダプター" msgid "Please, wait..." msgstr "お待ちください..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "テンプレートの追加" @@ -2193,3 +2192,7 @@ msgstr "割り振り:" msgid "No templates found." msgstr "テンプレートが見つかりません。" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "パラメーター %(params)s を %(resource)s で更新することは許可されません" diff --git a/po/kimchi.pot b/po/kimchi.pot index 1923fad..f98fc7f 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -30,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "" @@ -292,6 +287,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -711,6 +710,10 @@ msgstr "" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "" +#, python-format +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "" @@ -731,14 +734,14 @@ msgstr "" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" #, python-format @@ -1210,64 +1213,64 @@ msgstr "" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" +msgid "Cloning" msgstr "" -msgid "Device Type" +msgid "Start" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Reset" msgstr "" -msgid "Storage Pool" +msgid "Power Off" msgstr "" -msgid "Storage pool which volume located in" +msgid "Actions" msgstr "" -msgid "Storage Volume" +msgid "Connect" msgstr "" -msgid "Storage volume to be attached" +msgid "Clone" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" -msgid "Cloning" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Start" +msgid "Device Type" msgstr "" -msgid "Reset" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Power Off" +msgid "Storage Pool" msgstr "" -msgid "Actions" +msgid "Storage pool which volume located in" msgstr "" -msgid "Connect" +msgid "Storage Volume" msgstr "" -msgid "Clone" +msgid "Storage volume to be attached" msgstr "" -msgid "Edit" +msgid "File Path" msgstr "" -msgid "Shut Down" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Delete" +msgid "Attach" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1338,7 +1341,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" @@ -1761,21 +1764,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "" @@ -1846,6 +1834,21 @@ msgstr "" msgid "Please, wait..." msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 0f6f530..0394efe 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s에서는 업데이트 메소드를 구현하지 않음" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "%(resource)s의 작성은 허용되지 않음" @@ -301,6 +297,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -752,6 +752,9 @@ msgstr "네트워크 %(name)s을(를) 작성할 수 없습니다. 세부사항: msgid "Unable to find a free IP address for network '%(name)s'" msgstr "네트워크 '%(name)s'에 대한 여유 IP 주소를 찾을 수 없습니다." +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "네트워크 이름은 문자열이어야 합니다." @@ -773,19 +776,15 @@ msgstr "네트워크를 작성하려면 이름 및 유형을 지정하십시오. #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"%(name)s 네트워크를 삭제할 수 없습니다. 이 네트워크에 일부 가상 머신 및/또는 " -"템플리트가 링크되어 있습니다." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"%(name)s 네트워크를 비활성화할 수 없습니다. 이 네트워크에 일부 가상 머신 및/" -"또는템플리트가 링크되어 있습니다." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1264,36 +1263,6 @@ msgstr "취소" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "스토리지 장치를 VM에 추가" - -msgid "Device Type" -msgstr "장치 유형" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다." - -msgid "Storage Pool" -msgstr "스토리지 풀" - -msgid "Storage pool which volume located in" -msgstr "스토리지 풀 경로는 문자열이어야 합니다." - -msgid "Storage Volume" -msgstr "스토리지 풀 이름" - -msgid "Storage volume to be attached" -msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." - -msgid "File Path" -msgstr "파일 경로" - -msgid "The ISO file path in the server for CDROM." -msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." - -msgid "Attach" -msgstr "연결" - msgid "Cloning" msgstr "" @@ -1324,6 +1293,36 @@ msgstr "시스템 종료" msgid "Delete" msgstr "삭제" +msgid "Add a Storage Device to VM" +msgstr "스토리지 장치를 VM에 추가" + +msgid "Device Type" +msgstr "장치 유형" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다." + +msgid "Storage Pool" +msgstr "스토리지 풀" + +msgid "Storage pool which volume located in" +msgstr "스토리지 풀 경로는 문자열이어야 합니다." + +msgid "Storage Volume" +msgstr "스토리지 풀 이름" + +msgid "Storage volume to be attached" +msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." + +msgid "File Path" +msgstr "파일 경로" + +msgid "The ISO file path in the server for CDROM." +msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." + +msgid "Attach" +msgstr "연결" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." @@ -1395,7 +1394,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "올바른 ISO 파일이 아닙니다." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "시간이 오래 걸립니다. 계속하시겠습니까?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1834,21 +1833,6 @@ msgstr "예" msgid "No" msgstr "아니오" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "새 스토리지 풀 정의" @@ -1922,6 +1906,21 @@ msgstr "SCSI 어댑터" msgid "Please, wait..." msgstr "잠시 기다려 주십시오." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "템플리트 추가" @@ -2116,3 +2115,6 @@ msgstr "할당:" msgid "No templates found." msgstr "템플리트가 없습니다." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" diff --git a/po/pt_BR.po b/po/pt_BR.po index 898ee5d..92e2440 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\n" "PO-Revision-Date: 2014-12-02 12:15+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -48,10 +48,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s não implementa método de atualização" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Método de criação não é permitido em %(resource)s" @@ -338,6 +334,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "Não foi possível clonar a VM '%(name)s'. Detalhes: %(err)s" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -821,6 +821,9 @@ msgstr "Não foi possível criar a rede %(name)s. Detalhes: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Não foi possível encontrar um endereço IP livre para a rede '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "A interface %(iface)s já existe" + msgid "Network name must be a string" msgstr "Nome da rede deve ser um texto" @@ -842,19 +845,19 @@ msgstr "Especifique o nome e o tipo para criar uma rede" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Não foi possível remover a rede %(name)s. Há alguma máquina virtual e/ou " -"modelo associados a esta rede." +"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual " +"%(vms)s e/ou modelo associados a esta rede." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual e/ou " -"modelo associados a esta rede." +"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual " +"%(vms)s e/ou modelo associados a esta rede." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1380,6 +1383,36 @@ msgstr "Cancelar" msgid "revert" msgstr "Reverter" +msgid "Cloning" +msgstr "Clonando" + +msgid "Start" +msgstr "Iniciar" + +msgid "Reset" +msgstr "Reiniciar" + +msgid "Power Off" +msgstr "Forçar desligamento" + +msgid "Actions" +msgstr "Ações" + +msgid "Connect" +msgstr "Conectar" + +msgid "Clone" +msgstr "Clonar" + +msgid "Edit" +msgstr "Editar" + +msgid "Shut Down" +msgstr "Desligar" + +msgid "Delete" +msgstr "Remover" + msgid "Add a Storage Device to VM" msgstr "Adicionar um dispositivo de storage à VM" @@ -1411,36 +1444,6 @@ msgstr "O caminho do arquivo ISO para o CDROM no servidor." msgid "Attach" msgstr "Adicionar" -msgid "Cloning" -msgstr "Clonando" - -msgid "Start" -msgstr "Iniciar" - -msgid "Reset" -msgstr "Reiniciar" - -msgid "Power Off" -msgstr "Forçar desligamento" - -msgid "Actions" -msgstr "Ações" - -msgid "Connect" -msgstr "Conectar" - -msgid "Clone" -msgstr "Clonar" - -msgid "Edit" -msgstr "Editar" - -msgid "Shut Down" -msgstr "Desligar" - -msgid "Delete" -msgstr "Remover" - msgid "The username or password you entered is incorrect. Please try again." msgstr "" "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente." @@ -1513,7 +1516,7 @@ msgstr "Nenhuma ISO encontrada" msgid "This is not a valid ISO file." msgstr "Esse não é um arquivo ISO válido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Isso vai levar um longo tempo. Deseja continuar?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1977,21 +1980,6 @@ msgstr "Sim" msgid "No" msgstr "Não" -msgid "Add a Volume to Storage Pool" -msgstr "Adicionar um volume ao Storage Pool" - -msgid "Fetch from remote URL" -msgstr "Fazer download de uma URL remota" - -msgid "Enter the remote URL here." -msgstr "Digite a URL remota aqui." - -msgid "Upload a file" -msgstr "Fazer upload de um arquivo" - -msgid "Choose the file you want to upload." -msgstr "Escolha o arquivo que você quer fazer upload." - msgid "Define a New Storage Pool" msgstr "Definir novo Storage Pool" @@ -2065,6 +2053,21 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, aguarde..." +msgid "Add a Volume to Storage Pool" +msgstr "Adicionar um volume ao Storage Pool" + +msgid "Fetch from remote URL" +msgstr "Fazer download de uma URL remota" + +msgid "Enter the remote URL here." +msgstr "Digite a URL remota aqui." + +msgid "Upload a file" +msgstr "Fazer upload de um arquivo" + +msgid "Choose the file you want to upload." +msgstr "Escolha o arquivo que você quer fazer upload." + msgid "Add Template" msgstr "Adicionar Modelo" @@ -2260,3 +2263,6 @@ msgstr "Alocação" msgid "No templates found." msgstr "Nenhum modelo encontrado." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" diff --git a/po/ru_RU.po b/po/ru_RU.po index fa8d121..2b18fda 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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/" @@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s не реализуют метод обновления" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Обновление параметров %(params)s запрещено в %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Создание запрещено для %(resource)s" @@ -304,6 +300,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -747,6 +747,9 @@ msgstr "Не удалось создать сеть %(name)s. Сведения: msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Не найден свободный IP-адрес для сети %(name)s" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "Имя сети должно быть строкой" @@ -768,19 +771,15 @@ msgstr "Укажите имя и тип для создания сети" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Не удалось удалить сеть %(name)s. Есть виртуальные машины или шаблоны, " -"связанные с этой сетью." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Не удалось деактивировать сеть %(name)s. Есть виртуальные машины илишаблоны, " -"связанные с этой сетью." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1266,36 +1265,6 @@ msgstr "Отмена" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Добавить устройство хранения в VM" - -msgid "Device Type" -msgstr "Тип устройства" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"." - -msgid "Storage Pool" -msgstr "Пул памяти" - -msgid "Storage pool which volume located in" -msgstr "Путь к пулу памяти должен быть строкой" - -msgid "Storage Volume" -msgstr "Имя пула памяти" - -msgid "Storage volume to be attached" -msgstr "Имя тома должно быть строкой" - -msgid "File Path" -msgstr "Путь к файлу" - -msgid "The ISO file path in the server for CDROM." -msgstr "Путь к файлу ISO для CDROM на сервере." - -msgid "Attach" -msgstr "Подключить" - msgid "Cloning" msgstr "" @@ -1326,6 +1295,36 @@ msgstr "Завершить работу" msgid "Delete" msgstr "Удалить" +msgid "Add a Storage Device to VM" +msgstr "Добавить устройство хранения в VM" + +msgid "Device Type" +msgstr "Тип устройства" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"." + +msgid "Storage Pool" +msgstr "Пул памяти" + +msgid "Storage pool which volume located in" +msgstr "Путь к пулу памяти должен быть строкой" + +msgid "Storage Volume" +msgstr "Имя пула памяти" + +msgid "Storage volume to be attached" +msgstr "Имя тома должно быть строкой" + +msgid "File Path" +msgstr "Путь к файлу" + +msgid "The ISO file path in the server for CDROM." +msgstr "Путь к файлу ISO для CDROM на сервере." + +msgid "Attach" +msgstr "Подключить" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." @@ -1396,7 +1395,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Этот файл не является допустимым образом ISO." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Это займет много времени. Продолжить?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1839,21 +1838,6 @@ msgstr "Да" msgid "No" msgstr "Нет" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Создать пул памяти" @@ -1926,6 +1910,21 @@ msgstr "Адаптер SCSI" msgid "Please, wait..." msgstr "Подождите..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Добавить шаблон" @@ -2120,3 +2119,6 @@ msgstr "Выделение ресурсов:" msgid "No templates found." msgstr "Не найдены шаблоны." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Обновление параметров %(params)s запрещено в %(resource)s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 82d2980..c11d410 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: 2015-01-12 10:43+0800\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -46,10 +46,6 @@ msgid "%(resource)s does not implement update method" msgstr "不支持更新%(resource)s" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "不允许更新%(resource)s的%(params)s参数。" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "不允许创建%(resource)s" @@ -313,6 +309,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "虚拟机%(vmid)s未指明被分配的主机设备%(dev_name)s。" @@ -740,6 +740,9 @@ msgstr "不能创建网络%(name)s。详情：%(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "不能为网络'%(name)s'找到一个未使用的IP网络地址。" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "网络名称必须是字符串" @@ -760,15 +763,15 @@ msgstr "为新网络指定名字和类型" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." -msgstr "不能删除网络%(name)s。有虚拟机或者模板与这个网络关联" +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." +msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." -msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关联" +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." +msgstr "" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1372,7 +1375,7 @@ msgstr "没有发现ISO文件" msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "这需要一段时间。是否继续？" msgid "This will permanently delete the template. Would you like to continue?" @@ -2080,3 +2083,6 @@ msgstr "分配" msgid "No templates found." msgstr "没有发现模板" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "不允许更新%(resource)s的%(params)s参数。" diff --git a/po/zh_TW.po b/po/zh_TW.po index a12a56e..70ad038 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s 未實作更新方法" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "不容許更新 %(resource)s 中的參數 %(params)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "不容許針對 %(resource)s 執行建立" @@ -295,6 +291,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -714,6 +714,9 @@ msgstr "無法建立網路 %(name)s。詳細資料：%(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "找不到網路 '%(name)s' 的可用 IP 位址" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "網路名稱必須是字串" @@ -734,15 +737,15 @@ msgstr "指定名稱和類型以建立網路" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." -msgstr "無法刪除網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。" +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." +msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." -msgstr "無法取消啟動網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。" +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." +msgstr "" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1213,36 +1216,6 @@ msgstr "取消 " msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "將儲存裝置新增至 VM" - -msgid "Device Type" -msgstr "裝置類型" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "裝置類型。目前僅支援 \"cdrom\"。" - -msgid "Storage Pool" -msgstr "儲存區" - -msgid "Storage pool which volume located in" -msgstr "儲存區路徑必須是字串" - -msgid "Storage Volume" -msgstr "儲存區名稱" - -msgid "Storage volume to be attached" -msgstr "儲存磁區名稱必須是字串" - -msgid "File Path" -msgstr "檔案路徑" - -msgid "The ISO file path in the server for CDROM." -msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" - -msgid "Attach" -msgstr "連接" - msgid "Cloning" msgstr "" @@ -1273,6 +1246,36 @@ msgstr "關閉" msgid "Delete" msgstr "刪除" +msgid "Add a Storage Device to VM" +msgstr "將儲存裝置新增至 VM" + +msgid "Device Type" +msgstr "裝置類型" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "裝置類型。目前僅支援 \"cdrom\"。" + +msgid "Storage Pool" +msgstr "儲存區" + +msgid "Storage pool which volume located in" +msgstr "儲存區路徑必須是字串" + +msgid "Storage Volume" +msgstr "儲存區名稱" + +msgid "Storage volume to be attached" +msgstr "儲存磁區名稱必須是字串" + +msgid "File Path" +msgstr "檔案路徑" + +msgid "The ISO file path in the server for CDROM." +msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" + +msgid "Attach" +msgstr "連接" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" @@ -1343,7 +1346,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "這是無效的 ISO 檔案。" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "它將需要很長時間。要繼續嗎？" msgid "This will permanently delete the template. Would you like to continue?" @@ -1775,21 +1778,6 @@ msgstr "是" msgid "No" msgstr "否" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "定義新的儲存區" @@ -1860,6 +1848,21 @@ msgstr "SCSI 配接卡" msgid "Please, wait..." msgstr "請稍候..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "新增範本" @@ -2054,3 +2057,6 @@ msgstr "配置：" msgid "No templates found." msgstr "找不到範本。" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "不容許更新 %(resource)s 中的參數 %(params)s" diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a4a6dd5..b170d26 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -58,7 +58,7 @@ "KCHTMPL6002E": "$_("This is not a valid ISO file.")", - "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")", + "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", -- 2.1.0

2 1

[PATCH] Stop collecting background stats
by Christy Perez 24 Feb '15

24 Feb '15

Kimchi was taking up CPU cycles when no one was using it. In order to reduce CPU overhead, only collect information when someone has called the get_list function. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index b5fdb12..0117fb0 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -81,16 +81,12 @@ def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] self.caps = CapabilitiesModel(**kargs) - self.guests_stats_thread = BackgroundTask(GUESTS_STATS_INTERVAL, - self._update_guests_stats) - self.guests_stats_thread.start() - - def _update_guests_stats(self): - vm_list = self.get_list() - - for name in vm_list: + + @staticmethod + def _update_guests_stats(names, conn): + for name in names: try: - dom = VMModel.get_vm(name, self.conn) + dom = VMModel.get_vm(name, conn) vm_uuid = dom.UUIDString() info = dom.info() @@ -108,16 +104,17 @@ def _update_guests_stats(self): seconds = timestamp - prevStats.get('timestamp', 0) stats[vm_uuid].update({'timestamp': timestamp}) - self._get_percentage_cpu_usage(vm_uuid, info, seconds) - self._get_network_io_rate(vm_uuid, dom, seconds) - self._get_disk_io_rate(vm_uuid, dom, seconds) + VMsModel._get_percentage_cpu_usage(vm_uuid, info, seconds) + VMsModel._get_network_io_rate(vm_uuid, dom, seconds) + VMsModel._get_disk_io_rate(vm_uuid, dom, seconds) except Exception as e: # VM might be deleted just after we get the list. # This is OK, just skip. kimchi_log.debug('Error processing VM stats: %s', e.message) continue - def _get_percentage_cpu_usage(self, vm_uuid, info, seconds): + @staticmethod + def _get_percentage_cpu_usage(vm_uuid, info, seconds): prevCpuTime = stats[vm_uuid].get('cputime', 0) cpus = info[3] @@ -128,7 +125,8 @@ def _get_percentage_cpu_usage(self, vm_uuid, info, seconds): stats[vm_uuid].update({'cputime': info[4], 'cpu': percentage}) - def _get_network_io_rate(self, vm_uuid, dom, seconds): + @staticmethod + def _get_network_io_rate(vm_uuid, dom, seconds): prevNetRxKB = stats[vm_uuid].get('netRxKB', 0) prevNetTxKB = stats[vm_uuid].get('netTxKB', 0) currentMaxNetRate = stats[vm_uuid].get('max_net_io', 100) @@ -155,7 +153,8 @@ def _get_network_io_rate(self, vm_uuid, dom, seconds): stats[vm_uuid].update({'net_io': rate, 'max_net_io': max_net_io, 'netRxKB': netRxKB, 'netTxKB': netTxKB}) - def _get_disk_io_rate(self, vm_uuid, dom, seconds): + @staticmethod + def _get_disk_io_rate(vm_uuid, dom, seconds): prevDiskRdKB = stats[vm_uuid].get('diskRdKB', 0) prevDiskWrKB = stats[vm_uuid].get('diskWrKB', 0) currentMaxDiskRate = stats[vm_uuid].get('max_disk_io', 100) @@ -249,13 +248,15 @@ def create(self, params): return name def get_list(self): - return self.get_vms(self.conn) + return VMsModel.get_vms(self.conn) @staticmethod def get_vms(conn): - conn = conn.get() - names = [dom.name().decode('utf-8') for dom in conn.listAllDomains(0)] - return sorted(names, key=unicode.lower) + conn_ = conn.get() + names = [dom.name().decode('utf-8') for dom in conn_.listAllDomains(0)] + names = sorted(names, key=unicode.lower) + VMsModel._update_guests_stats(names, conn) + return names class VMModel(object): -- 2.1.0

2 1

[PATCH v3] Fix grammar for selected messages
by Christy Perez 24 Feb '15

24 Feb '15

There were two things I saw that needed to be fixed: - The ISO scan warning, "It may take long time," and - The interface error for an exsiting interface, "The interface already exist." Fixed these and corrected all the translation strings for other changes. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/de_DE.po | 123 +++++++++++++++++++++++---------------------- po/en_US.po | 94 ++++++++++++++++++----------------- po/es_ES.po | 124 ++++++++++++++++++++++++---------------------- po/fr_FR.po | 126 +++++++++++++++++++++++++---------------------- po/it_IT.po | 124 ++++++++++++++++++++++++---------------------- po/ja_JP.po | 121 +++++++++++++++++++++++---------------------- po/kimchi.pot | 95 ++++++++++++++++++----------------- po/ko_KR.po | 120 ++++++++++++++++++++++---------------------- po/pt_BR.po | 124 ++++++++++++++++++++++++---------------------- po/ru_RU.po | 120 ++++++++++++++++++++++---------------------- po/zh_CN.po | 30 ++++++----- po/zh_TW.po | 120 +++++++++++++++++++++++--------------------- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 2 +- src/kimchi/vmtemplate.py | 8 ++- src/nginx.conf.in | 1 + ui/pages/i18n.json.tmpl | 2 +- 17 files changed, 699 insertions(+), 636 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 5116d1f..6c4a089 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s implementiert keine Aktualisierungsmethode" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Erstellen ist nicht zulässig für %(resource)s" @@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -801,6 +801,9 @@ msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Es konnte keine freie IP-Adresse für Netz '%(name)s' gefunden werden" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "Netzname muss eine Zeichenfolge sein" @@ -823,19 +826,19 @@ msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Netz %(name)s konnte nicht gelöscht werden. Es sind einige virtuellen " -"Maschinen und/oder Vorlagen mit diesem Netz verknüpft." +"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen " +"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" "Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen " -"Maschinen und/oder Vorlagen mit diesem Netz verknüpft." +"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1334,36 +1337,6 @@ msgstr "Abbrechen" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" - -msgid "Device Type" -msgstr "Einheitentyp" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt." - -msgid "Storage Pool" -msgstr "Speicherpool" - -msgid "Storage pool which volume located in" -msgstr "Speicherpoolpfad muss eine Zeichenfolge sein" - -msgid "Storage Volume" -msgstr "Speicherpoolname" - -msgid "Storage volume to be attached" -msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" - -msgid "File Path" -msgstr "Dateipfad" - -msgid "The ISO file path in the server for CDROM." -msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." - -msgid "Attach" -msgstr "Anhängen" - msgid "Cloning" msgstr "" @@ -1394,6 +1367,36 @@ msgstr "Herunterfahren" msgid "Delete" msgstr "Löschen" +msgid "Add a Storage Device to VM" +msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" + +msgid "Device Type" +msgstr "Einheitentyp" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt." + +msgid "Storage Pool" +msgstr "Speicherpool" + +msgid "Storage pool which volume located in" +msgstr "Speicherpoolpfad muss eine Zeichenfolge sein" + +msgid "Storage Volume" +msgstr "Speicherpoolname" + +msgid "Storage volume to be attached" +msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" + +msgid "File Path" +msgstr "Dateipfad" + +msgid "The ISO file path in the server for CDROM." +msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." + +msgid "Attach" +msgstr "Anhängen" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist " @@ -1466,7 +1469,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Dies ist keine gültige ISO-Datei." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Dies wird einige Zeit dauern. Möchten Sie fortfahren?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1920,21 +1923,6 @@ msgstr "Ja" msgid "No" msgstr "Nein" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Neuen Speicherpool definieren" @@ -2013,6 +2001,21 @@ msgstr "SCSI-Adapter" msgid "Please, wait..." msgstr "Bitte warten..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Vorlage hinzufügen" @@ -2208,3 +2211,7 @@ msgstr "Zuordnung:" msgid "No templates found." msgstr "Keine Vorlagen gefunden." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" diff --git a/po/en_US.po b/po/en_US.po index 05ca48a..5e66487 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "" @@ -292,6 +288,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -711,6 +711,10 @@ msgstr "" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "" +#, python-format +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "" @@ -731,14 +735,14 @@ msgstr "" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" #, python-format @@ -1210,64 +1214,64 @@ msgstr "" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" +msgid "Cloning" msgstr "" -msgid "Device Type" +msgid "Start" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Reset" msgstr "" -msgid "Storage Pool" +msgid "Power Off" msgstr "" -msgid "Storage pool which volume located in" +msgid "Actions" msgstr "" -msgid "Storage Volume" +msgid "Connect" msgstr "" -msgid "Storage volume to be attached" +msgid "Clone" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" -msgid "Cloning" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Start" +msgid "Device Type" msgstr "" -msgid "Reset" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Power Off" +msgid "Storage Pool" msgstr "" -msgid "Actions" +msgid "Storage pool which volume located in" msgstr "" -msgid "Connect" +msgid "Storage Volume" msgstr "" -msgid "Clone" +msgid "Storage volume to be attached" msgstr "" -msgid "Edit" +msgid "File Path" msgstr "" -msgid "Shut Down" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Delete" +msgid "Attach" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1338,7 +1342,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" @@ -1761,21 +1765,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "" @@ -1846,6 +1835,21 @@ msgstr "" msgid "Please, wait..." msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 573dc03..4816918 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s no implementa método de actualización" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Crear no está permitido para %(resource)s" @@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -810,6 +810,9 @@ msgstr "No se puede crear la red %(name)s. Detalles: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "No se puede encontrar una dirección IP libre para la red '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "La interfaz %(iface)s ya existe" + msgid "Network name must be a string" msgstr "El nombre de red debe ser una serie" @@ -832,19 +835,19 @@ msgstr "Especifique el nombre y el tipo para crear una red" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales y/o " -"plantillas enlazadas a esta red." +"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales %(vms)s " +"y/o plantillas enlazadas a esta red." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales y/o " -"plantillas enlazadas a esta red." +"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales " +"%(vms)s y/o plantillas enlazadas a esta red." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1352,36 +1355,6 @@ msgstr "Cancelar" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Añadir un dispositivo de almacenamiento a VM" - -msgid "Device Type" -msgstr "Tipo de dispositivo" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"." - -msgid "Storage Pool" -msgstr "Agrupación de almacenamiento" - -msgid "Storage pool which volume located in" -msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie" - -msgid "Storage Volume" -msgstr "Nombre de agrupación de almacenamiento" - -msgid "Storage volume to be attached" -msgstr "El nombre de volumen de almacenamiento debe ser una serie" - -msgid "File Path" -msgstr "Vía de acceso de archivo" - -msgid "The ISO file path in the server for CDROM." -msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." - -msgid "Attach" -msgstr "Conectar" - msgid "Cloning" msgstr "" @@ -1412,6 +1385,36 @@ msgstr "Concluir" msgid "Delete" msgstr "Suprimir" +msgid "Add a Storage Device to VM" +msgstr "Añadir un dispositivo de almacenamiento a VM" + +msgid "Device Type" +msgstr "Tipo de dispositivo" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"." + +msgid "Storage Pool" +msgstr "Agrupación de almacenamiento" + +msgid "Storage pool which volume located in" +msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie" + +msgid "Storage Volume" +msgstr "Nombre de agrupación de almacenamiento" + +msgid "Storage volume to be attached" +msgstr "El nombre de volumen de almacenamiento debe ser una serie" + +msgid "File Path" +msgstr "Vía de acceso de archivo" + +msgid "The ISO file path in the server for CDROM." +msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." + +msgid "Attach" +msgstr "Conectar" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "El nombre de usuario o contraseña que ha especificado es incorrecto. Por " @@ -1485,7 +1488,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "No es un archivo ISO válido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Tardará mucho tiempo. ¿Desea continuar?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1939,21 +1942,6 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Definir una agrupación de almacenamiento nueva" @@ -2030,6 +2018,21 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, espere..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Añadir plantilla" @@ -2227,3 +2230,6 @@ msgstr "Asignado:" msgid "No templates found." msgstr "No se han encontrado plantillas." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" diff --git a/po/fr_FR.po b/po/fr_FR.po index 715d612..3d49ca3 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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/" @@ -30,12 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s n'implémente pas de méthode de mise à jour" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" -"Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " -"%(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "La création n'est pas autorisée pour %(resource)s" @@ -329,6 +323,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -821,6 +819,9 @@ msgstr "Impossible de créer le réseau %(name)s. Détails: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Impossible de trouver une adresse IP libre pour le réseau '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "L'interface %(iface)s existe déjà" + msgid "Network name must be a string" msgstr "Le nom de réseau doit être une chaîne de caractères" @@ -843,19 +844,19 @@ msgstr "Spécifiez un nom et un type pour créer un réseau" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" "Impossible de supprimer le réseau %(name)s. Il y a des machines virtuelles " -"et/ou des modèles liés à ce réseau. " +"%(vms)s et/ou des modèles liés à ce réseau. " #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles et/" -"ou des modèles liés à ce réseau. " +"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles" +"%(vms)s et/ou des modèles liés à ce réseau. " #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1367,6 +1368,36 @@ msgstr "Annuler" msgid "revert" msgstr "" +msgid "Cloning" +msgstr "" + +msgid "Start" +msgstr "Démarrer" + +msgid "Reset" +msgstr "Réinitialiser" + +msgid "Power Off" +msgstr "Mettre hors tension" + +msgid "Actions" +msgstr "Actions" + +msgid "Connect" +msgstr "Connecter" + +msgid "Clone" +msgstr "Cloner" + +msgid "Edit" +msgstr "Éditer" + +msgid "Shut Down" +msgstr "Éteindre" + +msgid "Delete" +msgstr "Supprimer" + msgid "Add a Storage Device to VM" msgstr "Ajouter un Périphérique de Stockage à la VM" @@ -1398,36 +1429,6 @@ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM." msgid "Attach" msgstr "Attacher" -msgid "Cloning" -msgstr "" - -msgid "Start" -msgstr "Démarrer" - -msgid "Reset" -msgstr "Réinitialiser" - -msgid "Power Off" -msgstr "Mettre hors tension" - -msgid "Actions" -msgstr "Actions" - -msgid "Connect" -msgstr "Connecter" - -msgid "Clone" -msgstr "Cloner" - -msgid "Edit" -msgstr "Éditer" - -msgid "Shut Down" -msgstr "Éteindre" - -msgid "Delete" -msgstr "Supprimer" - msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. " @@ -1502,7 +1503,7 @@ msgstr "Aucune ISO détectée" msgid "This is not a valid ISO file." msgstr "Ce n'est pas un fichier ISO valide." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Cela va prendre un long moment. Voulez-vous continuer ?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1964,21 +1965,6 @@ msgstr "Oui" msgid "No" msgstr "Non" -msgid "Add a Volume to Storage Pool" -msgstr "iAjouter un Volume au Pool de Stockage" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "Saisir une URL distante ici" - -msgid "Upload a file" -msgstr "Charger un fichier" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Définir un Nouveau Pool de Stockage" @@ -2057,6 +2043,21 @@ msgstr "Adaptateur SCSI" msgid "Please, wait..." msgstr "Veuillez patienter..." +msgid "Add a Volume to Storage Pool" +msgstr "iAjouter un Volume au Pool de Stockage" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "Saisir une URL distante ici" + +msgid "Upload a file" +msgstr "Charger un fichier" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Ajouter un Modèle" @@ -2252,3 +2253,8 @@ msgstr "Allocation" msgid "No templates found." msgstr "Aucun modèle trouvé." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " +#~ "%(resource)s" diff --git a/po/it_IT.po b/po/it_IT.po index 1746bed..1b810db 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s non implementa il metodo di aggiornamento" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Creazione non consentita per %(resource)s" @@ -311,6 +307,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -783,6 +783,9 @@ msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "L'interfaccia %(iface)s già esistente." + msgid "Network name must be a string" msgstr "Il nome della rete deve essere una stringa" @@ -805,19 +808,19 @@ msgstr "Specificare nome e tipo per creare una rete" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali e/o " -"modelli collegati a tale rete." +"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali " +"%(vms)s e/o modelli collegati a tale rete." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie/" -"o modelli collegati a tale rete." +"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie " +"%(vms)s e/o modelli collegati a tale rete." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1321,36 +1324,6 @@ msgstr "Annulla" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Aggiungi un dispositivo di memoria alla VM" - -msgid "Device Type" -msgstr "Tipo dispositivo" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"." - -msgid "Storage Pool" -msgstr "Pool di memoria" - -msgid "Storage pool which volume located in" -msgstr "Il percorso del pool di memoria deve essere una stringa" - -msgid "Storage Volume" -msgstr "Nome pool di memoria" - -msgid "Storage volume to be attached" -msgstr "Il nome del volume di memoria deve essere una stringa" - -msgid "File Path" -msgstr "Percorso file" - -msgid "The ISO file path in the server for CDROM." -msgstr "Il percorso file ISO nel server per CDROM." - -msgid "Attach" -msgstr "Allega" - msgid "Cloning" msgstr "" @@ -1381,6 +1354,36 @@ msgstr "Arresta" msgid "Delete" msgstr "Elimina" +msgid "Add a Storage Device to VM" +msgstr "Aggiungi un dispositivo di memoria alla VM" + +msgid "Device Type" +msgstr "Tipo dispositivo" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"." + +msgid "Storage Pool" +msgstr "Pool di memoria" + +msgid "Storage pool which volume located in" +msgstr "Il percorso del pool di memoria deve essere una stringa" + +msgid "Storage Volume" +msgstr "Nome pool di memoria" + +msgid "Storage volume to be attached" +msgstr "Il nome del volume di memoria deve essere una stringa" + +msgid "File Path" +msgstr "Percorso file" + +msgid "The ISO file path in the server for CDROM." +msgstr "Il percorso file ISO nel server per CDROM." + +msgid "Attach" +msgstr "Allega" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " @@ -1454,7 +1457,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Non è un file ISO valido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Richiederà molto tempo. Continuare?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1906,21 +1909,6 @@ msgstr "Sì" msgid "No" msgstr "No" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Definisci un nuovo pool di memoria" @@ -2000,6 +1988,21 @@ msgstr "Adattatore SCSI" msgid "Please, wait..." msgstr "Attendere..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Aggiungi modello" @@ -2195,3 +2198,6 @@ msgstr "Allocazione:" msgid "No templates found." msgstr "Nessun modello trovato." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" diff --git a/po/ja_JP.po b/po/ja_JP.po index f9fe5ee..c04ea0c 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s は更新メソッドを実装していません" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "パラメーター %(params)s を %(resource)s で更新することは許可されません" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "%(resource)s の作成は許可されません" @@ -308,6 +304,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -799,6 +799,9 @@ msgstr "ネットワーク %(name)s を作成できません。詳細: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "ネットワーク「%(name)s」のフリー IP アドレスが見つかりません。" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "ネットワーク名はストリングでなければなりません" @@ -821,19 +824,15 @@ msgstr "ネットワークを作成するには、名前とタイプを指定し #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"ネットワーク %(name)s を削除できません。いくつかの仮想マシン/テンプレートが、" -"このネットワークにリンクしています。" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"ネットワーク %(name)s を非アクティブにできません。いくつかの仮想マシン/テンプ" -"レートが、このネットワークにリンクしています。" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1333,36 +1332,6 @@ msgstr "取消" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "VM にストレージ・デバイスを追加" - -msgid "Device Type" -msgstr "デバイス・タイプ" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。" - -msgid "Storage Pool" -msgstr "ストレージ・プール" - -msgid "Storage pool which volume located in" -msgstr "ストレージ・プール・パスはストリングでなければなりません" - -msgid "Storage Volume" -msgstr "ストレージ・プール名" - -msgid "Storage volume to be attached" -msgstr "ストレージ・ボリューム名はストリングでなければなりません" - -msgid "File Path" -msgstr "ファイル・パス" - -msgid "The ISO file path in the server for CDROM." -msgstr "サーバー内での CDROM の ISO ファイル・パス。" - -msgid "Attach" -msgstr "接続" - msgid "Cloning" msgstr "" @@ -1393,6 +1362,36 @@ msgstr "シャットダウン" msgid "Delete" msgstr "削除" +msgid "Add a Storage Device to VM" +msgstr "VM にストレージ・デバイスを追加" + +msgid "Device Type" +msgstr "デバイス・タイプ" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。" + +msgid "Storage Pool" +msgstr "ストレージ・プール" + +msgid "Storage pool which volume located in" +msgstr "ストレージ・プール・パスはストリングでなければなりません" + +msgid "Storage Volume" +msgstr "ストレージ・プール名" + +msgid "Storage volume to be attached" +msgstr "ストレージ・ボリューム名はストリングでなければなりません" + +msgid "File Path" +msgstr "ファイル・パス" + +msgid "The ISO file path in the server for CDROM." +msgstr "サーバー内での CDROM の ISO ファイル・パス。" + +msgid "Attach" +msgstr "接続" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" @@ -1463,7 +1462,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "有効な ISO ファイルではありません。" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "しばらく時間がかかることがあります。続行しますか?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1907,21 +1906,6 @@ msgstr " はい" msgid "No" msgstr " いいえ" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "新規ストレージ・プールの定義" @@ -1999,6 +1983,21 @@ msgstr "SCSI アダプター" msgid "Please, wait..." msgstr "お待ちください..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "テンプレートの追加" @@ -2193,3 +2192,7 @@ msgstr "割り振り:" msgid "No templates found." msgstr "テンプレートが見つかりません。" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "パラメーター %(params)s を %(resource)s で更新することは許可されません" diff --git a/po/kimchi.pot b/po/kimchi.pot index 1923fad..f98fc7f 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -30,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "" @@ -292,6 +287,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -711,6 +710,10 @@ msgstr "" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "" +#, python-format +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "" @@ -731,14 +734,14 @@ msgstr "" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" #, python-format @@ -1210,64 +1213,64 @@ msgstr "" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" +msgid "Cloning" msgstr "" -msgid "Device Type" +msgid "Start" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Reset" msgstr "" -msgid "Storage Pool" +msgid "Power Off" msgstr "" -msgid "Storage pool which volume located in" +msgid "Actions" msgstr "" -msgid "Storage Volume" +msgid "Connect" msgstr "" -msgid "Storage volume to be attached" +msgid "Clone" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" -msgid "Cloning" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Start" +msgid "Device Type" msgstr "" -msgid "Reset" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Power Off" +msgid "Storage Pool" msgstr "" -msgid "Actions" +msgid "Storage pool which volume located in" msgstr "" -msgid "Connect" +msgid "Storage Volume" msgstr "" -msgid "Clone" +msgid "Storage volume to be attached" msgstr "" -msgid "Edit" +msgid "File Path" msgstr "" -msgid "Shut Down" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Delete" +msgid "Attach" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1338,7 +1341,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" @@ -1761,21 +1764,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "" @@ -1846,6 +1834,21 @@ msgstr "" msgid "Please, wait..." msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 0f6f530..0394efe 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s에서는 업데이트 메소드를 구현하지 않음" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "%(resource)s의 작성은 허용되지 않음" @@ -301,6 +297,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -752,6 +752,9 @@ msgstr "네트워크 %(name)s을(를) 작성할 수 없습니다. 세부사항: msgid "Unable to find a free IP address for network '%(name)s'" msgstr "네트워크 '%(name)s'에 대한 여유 IP 주소를 찾을 수 없습니다." +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "네트워크 이름은 문자열이어야 합니다." @@ -773,19 +776,15 @@ msgstr "네트워크를 작성하려면 이름 및 유형을 지정하십시오. #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"%(name)s 네트워크를 삭제할 수 없습니다. 이 네트워크에 일부 가상 머신 및/또는 " -"템플리트가 링크되어 있습니다." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"%(name)s 네트워크를 비활성화할 수 없습니다. 이 네트워크에 일부 가상 머신 및/" -"또는템플리트가 링크되어 있습니다." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1264,36 +1263,6 @@ msgstr "취소" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "스토리지 장치를 VM에 추가" - -msgid "Device Type" -msgstr "장치 유형" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다." - -msgid "Storage Pool" -msgstr "스토리지 풀" - -msgid "Storage pool which volume located in" -msgstr "스토리지 풀 경로는 문자열이어야 합니다." - -msgid "Storage Volume" -msgstr "스토리지 풀 이름" - -msgid "Storage volume to be attached" -msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." - -msgid "File Path" -msgstr "파일 경로" - -msgid "The ISO file path in the server for CDROM." -msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." - -msgid "Attach" -msgstr "연결" - msgid "Cloning" msgstr "" @@ -1324,6 +1293,36 @@ msgstr "시스템 종료" msgid "Delete" msgstr "삭제" +msgid "Add a Storage Device to VM" +msgstr "스토리지 장치를 VM에 추가" + +msgid "Device Type" +msgstr "장치 유형" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다." + +msgid "Storage Pool" +msgstr "스토리지 풀" + +msgid "Storage pool which volume located in" +msgstr "스토리지 풀 경로는 문자열이어야 합니다." + +msgid "Storage Volume" +msgstr "스토리지 풀 이름" + +msgid "Storage volume to be attached" +msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." + +msgid "File Path" +msgstr "파일 경로" + +msgid "The ISO file path in the server for CDROM." +msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." + +msgid "Attach" +msgstr "연결" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." @@ -1395,7 +1394,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "올바른 ISO 파일이 아닙니다." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "시간이 오래 걸립니다. 계속하시겠습니까?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1834,21 +1833,6 @@ msgstr "예" msgid "No" msgstr "아니오" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "새 스토리지 풀 정의" @@ -1922,6 +1906,21 @@ msgstr "SCSI 어댑터" msgid "Please, wait..." msgstr "잠시 기다려 주십시오." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "템플리트 추가" @@ -2116,3 +2115,6 @@ msgstr "할당:" msgid "No templates found." msgstr "템플리트가 없습니다." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" diff --git a/po/pt_BR.po b/po/pt_BR.po index 898ee5d..92e2440 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\n" "PO-Revision-Date: 2014-12-02 12:15+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -48,10 +48,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s não implementa método de atualização" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Método de criação não é permitido em %(resource)s" @@ -338,6 +334,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "Não foi possível clonar a VM '%(name)s'. Detalhes: %(err)s" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -821,6 +821,9 @@ msgstr "Não foi possível criar a rede %(name)s. Detalhes: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Não foi possível encontrar um endereço IP livre para a rede '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "A interface %(iface)s já existe" + msgid "Network name must be a string" msgstr "Nome da rede deve ser um texto" @@ -842,19 +845,19 @@ msgstr "Especifique o nome e o tipo para criar uma rede" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Não foi possível remover a rede %(name)s. Há alguma máquina virtual e/ou " -"modelo associados a esta rede." +"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual " +"%(vms)s e/ou modelo associados a esta rede." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual e/ou " -"modelo associados a esta rede." +"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual " +"%(vms)s e/ou modelo associados a esta rede." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1380,6 +1383,36 @@ msgstr "Cancelar" msgid "revert" msgstr "Reverter" +msgid "Cloning" +msgstr "Clonando" + +msgid "Start" +msgstr "Iniciar" + +msgid "Reset" +msgstr "Reiniciar" + +msgid "Power Off" +msgstr "Forçar desligamento" + +msgid "Actions" +msgstr "Ações" + +msgid "Connect" +msgstr "Conectar" + +msgid "Clone" +msgstr "Clonar" + +msgid "Edit" +msgstr "Editar" + +msgid "Shut Down" +msgstr "Desligar" + +msgid "Delete" +msgstr "Remover" + msgid "Add a Storage Device to VM" msgstr "Adicionar um dispositivo de storage à VM" @@ -1411,36 +1444,6 @@ msgstr "O caminho do arquivo ISO para o CDROM no servidor." msgid "Attach" msgstr "Adicionar" -msgid "Cloning" -msgstr "Clonando" - -msgid "Start" -msgstr "Iniciar" - -msgid "Reset" -msgstr "Reiniciar" - -msgid "Power Off" -msgstr "Forçar desligamento" - -msgid "Actions" -msgstr "Ações" - -msgid "Connect" -msgstr "Conectar" - -msgid "Clone" -msgstr "Clonar" - -msgid "Edit" -msgstr "Editar" - -msgid "Shut Down" -msgstr "Desligar" - -msgid "Delete" -msgstr "Remover" - msgid "The username or password you entered is incorrect. Please try again." msgstr "" "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente." @@ -1513,7 +1516,7 @@ msgstr "Nenhuma ISO encontrada" msgid "This is not a valid ISO file." msgstr "Esse não é um arquivo ISO válido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Isso vai levar um longo tempo. Deseja continuar?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1977,21 +1980,6 @@ msgstr "Sim" msgid "No" msgstr "Não" -msgid "Add a Volume to Storage Pool" -msgstr "Adicionar um volume ao Storage Pool" - -msgid "Fetch from remote URL" -msgstr "Fazer download de uma URL remota" - -msgid "Enter the remote URL here." -msgstr "Digite a URL remota aqui." - -msgid "Upload a file" -msgstr "Fazer upload de um arquivo" - -msgid "Choose the file you want to upload." -msgstr "Escolha o arquivo que você quer fazer upload." - msgid "Define a New Storage Pool" msgstr "Definir novo Storage Pool" @@ -2065,6 +2053,21 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, aguarde..." +msgid "Add a Volume to Storage Pool" +msgstr "Adicionar um volume ao Storage Pool" + +msgid "Fetch from remote URL" +msgstr "Fazer download de uma URL remota" + +msgid "Enter the remote URL here." +msgstr "Digite a URL remota aqui." + +msgid "Upload a file" +msgstr "Fazer upload de um arquivo" + +msgid "Choose the file you want to upload." +msgstr "Escolha o arquivo que você quer fazer upload." + msgid "Add Template" msgstr "Adicionar Modelo" @@ -2260,3 +2263,6 @@ msgstr "Alocação" msgid "No templates found." msgstr "Nenhum modelo encontrado." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" diff --git a/po/ru_RU.po b/po/ru_RU.po index fa8d121..2b18fda 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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/" @@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s не реализуют метод обновления" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Обновление параметров %(params)s запрещено в %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Создание запрещено для %(resource)s" @@ -304,6 +300,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -747,6 +747,9 @@ msgstr "Не удалось создать сеть %(name)s. Сведения: msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Не найден свободный IP-адрес для сети %(name)s" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "Имя сети должно быть строкой" @@ -768,19 +771,15 @@ msgstr "Укажите имя и тип для создания сети" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Не удалось удалить сеть %(name)s. Есть виртуальные машины или шаблоны, " -"связанные с этой сетью." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Не удалось деактивировать сеть %(name)s. Есть виртуальные машины илишаблоны, " -"связанные с этой сетью." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1266,36 +1265,6 @@ msgstr "Отмена" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Добавить устройство хранения в VM" - -msgid "Device Type" -msgstr "Тип устройства" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"." - -msgid "Storage Pool" -msgstr "Пул памяти" - -msgid "Storage pool which volume located in" -msgstr "Путь к пулу памяти должен быть строкой" - -msgid "Storage Volume" -msgstr "Имя пула памяти" - -msgid "Storage volume to be attached" -msgstr "Имя тома должно быть строкой" - -msgid "File Path" -msgstr "Путь к файлу" - -msgid "The ISO file path in the server for CDROM." -msgstr "Путь к файлу ISO для CDROM на сервере." - -msgid "Attach" -msgstr "Подключить" - msgid "Cloning" msgstr "" @@ -1326,6 +1295,36 @@ msgstr "Завершить работу" msgid "Delete" msgstr "Удалить" +msgid "Add a Storage Device to VM" +msgstr "Добавить устройство хранения в VM" + +msgid "Device Type" +msgstr "Тип устройства" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"." + +msgid "Storage Pool" +msgstr "Пул памяти" + +msgid "Storage pool which volume located in" +msgstr "Путь к пулу памяти должен быть строкой" + +msgid "Storage Volume" +msgstr "Имя пула памяти" + +msgid "Storage volume to be attached" +msgstr "Имя тома должно быть строкой" + +msgid "File Path" +msgstr "Путь к файлу" + +msgid "The ISO file path in the server for CDROM." +msgstr "Путь к файлу ISO для CDROM на сервере." + +msgid "Attach" +msgstr "Подключить" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." @@ -1396,7 +1395,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Этот файл не является допустимым образом ISO." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Это займет много времени. Продолжить?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1839,21 +1838,6 @@ msgstr "Да" msgid "No" msgstr "Нет" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Создать пул памяти" @@ -1926,6 +1910,21 @@ msgstr "Адаптер SCSI" msgid "Please, wait..." msgstr "Подождите..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Добавить шаблон" @@ -2120,3 +2119,6 @@ msgstr "Выделение ресурсов:" msgid "No templates found." msgstr "Не найдены шаблоны." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Обновление параметров %(params)s запрещено в %(resource)s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 82d2980..c11d410 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: 2015-01-12 10:43+0800\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -46,10 +46,6 @@ msgid "%(resource)s does not implement update method" msgstr "不支持更新%(resource)s" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "不允许更新%(resource)s的%(params)s参数。" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "不允许创建%(resource)s" @@ -313,6 +309,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "虚拟机%(vmid)s未指明被分配的主机设备%(dev_name)s。" @@ -740,6 +740,9 @@ msgstr "不能创建网络%(name)s。详情：%(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "不能为网络'%(name)s'找到一个未使用的IP网络地址。" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "网络名称必须是字符串" @@ -760,15 +763,15 @@ msgstr "为新网络指定名字和类型" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." -msgstr "不能删除网络%(name)s。有虚拟机或者模板与这个网络关联" +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." +msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." -msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关联" +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." +msgstr "" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1372,7 +1375,7 @@ msgstr "没有发现ISO文件" msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "这需要一段时间。是否继续？" msgid "This will permanently delete the template. Would you like to continue?" @@ -2080,3 +2083,6 @@ msgstr "分配" msgid "No templates found." msgstr "没有发现模板" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "不允许更新%(resource)s的%(params)s参数。" diff --git a/po/zh_TW.po b/po/zh_TW.po index a12a56e..70ad038 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: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s 未實作更新方法" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "不容許更新 %(resource)s 中的參數 %(params)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "不容許針對 %(resource)s 執行建立" @@ -295,6 +291,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -714,6 +714,9 @@ msgstr "無法建立網路 %(name)s。詳細資料：%(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "找不到網路 '%(name)s' 的可用 IP 位址" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "網路名稱必須是字串" @@ -734,15 +737,15 @@ msgstr "指定名稱和類型以建立網路" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." -msgstr "無法刪除網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。" +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." +msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." -msgstr "無法取消啟動網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。" +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." +msgstr "" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1213,36 +1216,6 @@ msgstr "取消 " msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "將儲存裝置新增至 VM" - -msgid "Device Type" -msgstr "裝置類型" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "裝置類型。目前僅支援 \"cdrom\"。" - -msgid "Storage Pool" -msgstr "儲存區" - -msgid "Storage pool which volume located in" -msgstr "儲存區路徑必須是字串" - -msgid "Storage Volume" -msgstr "儲存區名稱" - -msgid "Storage volume to be attached" -msgstr "儲存磁區名稱必須是字串" - -msgid "File Path" -msgstr "檔案路徑" - -msgid "The ISO file path in the server for CDROM." -msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" - -msgid "Attach" -msgstr "連接" - msgid "Cloning" msgstr "" @@ -1273,6 +1246,36 @@ msgstr "關閉" msgid "Delete" msgstr "刪除" +msgid "Add a Storage Device to VM" +msgstr "將儲存裝置新增至 VM" + +msgid "Device Type" +msgstr "裝置類型" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "裝置類型。目前僅支援 \"cdrom\"。" + +msgid "Storage Pool" +msgstr "儲存區" + +msgid "Storage pool which volume located in" +msgstr "儲存區路徑必須是字串" + +msgid "Storage Volume" +msgstr "儲存區名稱" + +msgid "Storage volume to be attached" +msgstr "儲存磁區名稱必須是字串" + +msgid "File Path" +msgstr "檔案路徑" + +msgid "The ISO file path in the server for CDROM." +msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" + +msgid "Attach" +msgstr "連接" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" @@ -1343,7 +1346,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "這是無效的 ISO 檔案。" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "它將需要很長時間。要繼續嗎？" msgid "This will permanently delete the template. Would you like to continue?" @@ -1775,21 +1778,6 @@ msgstr "是" msgid "No" msgstr "否" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "定義新的儲存區" @@ -1860,6 +1848,21 @@ msgstr "SCSI 配接卡" msgid "Please, wait..." msgstr "請稍候..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "新增範本" @@ -2054,3 +2057,6 @@ msgstr "配置：" msgid "No templates found." msgstr "找不到範本。" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "不容許更新 %(resource)s 中的參數 %(params)s" diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 1e36a6d..b5a1769 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -117,6 +117,7 @@ ('fedora', lambda m: m.group(1), 'Fedora.*-(\d+)-'), ('gentoo', lambda m: m.group(1), 'Gentoo Linux \w+ (\d+)'), ('powerkvm', 'live_cd', 'POWERKVM_LIVECD'), + ('arch', lambda m: m.group(1), 'ARCH_(\d+)'), ] diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 149f059..2496e03 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -77,7 +77,7 @@ modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', 'centos': '5.3', 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', - 'sles': '11'}, + 'sles': '11', 'arch': '0'}, 'power': {'rhel': '6.5', 'fedora': '19', 'ubuntu': '14.04', 'opensuse': '13.1', diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index d4fbe8b..ef41d0a 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -202,8 +202,12 @@ def to_volume_list(self, vm_uuid): 'capacity': d['size'], 'format': fmt, 'path': '%s/%s' % (storage_path, volume)} - info['allocation'] = 0 if fmt in ['qcow2', 'raw'] \ - else info['capacity'] + + if 'logical' == self._get_storage_type() or \ + fmt not in ['qcow2', 'raw']: + info['allocation'] = info['capacity'] + else: + info['allocation'] = 0 if 'base' in d: info['base'] = dict() diff --git a/src/nginx.conf.in b/src/nginx.conf.in index b5d207f..ed926a3 100644 --- a/src/nginx.conf.in +++ b/src/nginx.conf.in @@ -52,6 +52,7 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header X-Frame-Options DENY; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a4a6dd5..b170d26 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -58,7 +58,7 @@ "KCHTMPL6002E": "$_("This is not a valid ISO file.")", - "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")", + "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", -- 2.1.0

2 1

[PATCH] issue #512: Attach the function "showMessage" to the UI grid class
by Crístian Viana 24 Feb '15

24 Feb '15

The JavaScript "class" kimchi.widget.Grid (which renders the packages and repositories list) lacks the function "showMessage" (which displays a message inside the grid). The function itself is already declared but it isn't attached to the class, so it cannot be used. When an error happens while reading the update packages or repositories list, that function is supposed to be executed, however it doesn't exist in the class and nothing is displayed. Attach the function "showMessage" to its corresponding class so it can be used correctly. In order to test this patch, create a failing scenario to get the update packages list and open the tab "Hosts". Without this patch, the update grid will be empty; with this patch, an error message will be displayed in the update grid. On Fedora, the failing scenario can be created by running "sudo yum update" (when there are packages to be updated) and not confirming the update, so Yum leaves a lock preventing other simultaneous operations to be executed. Fix issue #512 ("Software updates" doesn't show available updates). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 26e05d5..6365d5c 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -522,6 +522,7 @@ kimchi.widget.Grid.prototype = (function() { setData: setData, getSelected: getSelected, reload: reload, - destroy: destroy + destroy: destroy, + showMessage: showMessage }; })(); -- 2.1.0

2 1

[PATCH v2 0/2] ISO Scan grammar fix
by Christy Perez 24 Feb '15

24 Feb '15

Change "It will take long time" to "This may take a long time." Christy Perez (2): Fix iso scan warning's EN grammar Cleaning up fuzzy translation strings after make po/de_DE.po | 117 ++++++++++++++++++++++++---------------------- po/en_US.po | 94 +++++++++++++++++++------------------ po/es_ES.po | 117 ++++++++++++++++++++++++---------------------- po/fr_FR.po | 121 +++++++++++++++++++++++++----------------------- po/it_IT.po | 117 ++++++++++++++++++++++++---------------------- po/ja_JP.po | 118 ++++++++++++++++++++++++---------------------- po/kimchi.pot | 97 +++++++++++++++++++------------------- po/ko_KR.po | 117 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 117 ++++++++++++++++++++++++---------------------- po/ru_RU.po | 117 ++++++++++++++++++++++++---------------------- po/zh_CN.po | 31 ++++++++----- po/zh_TW.po | 121 +++++++++++++++++++++++++----------------------- ui/pages/i18n.json.tmpl | 2 +- 13 files changed, 681 insertions(+), 605 deletions(-) -- 2.1.0

2 3

[PATCH] Fix iso scan warning's EN grammar
by Christy Perez 24 Feb '15

24 Feb '15

The patch is the manual changes only, without running the make commands. There are a lot of other translation changes that will be pulled in after a make, so I'm leaving that step out for simplicity when reviewing this patch. If needed, I can run make and re-submit after review. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/de_DE.po | 2 +- po/en_US.po | 2 +- po/es_ES.po | 2 +- po/fr_FR.po | 2 +- po/it_IT.po | 2 +- po/ja_JP.po | 2 +- po/kimchi.pot | 2 +- po/ko_KR.po | 2 +- po/pt_BR.po | 2 +- po/ru_RU.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- ui/pages/i18n.json.tmpl | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 5116d1f..a730040 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1466,7 +1466,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Dies ist keine g��ltige ISO-Datei." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Dies wird einige Zeit dauern. M��chten Sie fortfahren?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/en_US.po b/po/en_US.po index 05ca48a..8c3aeda 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1338,7 +1338,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/es_ES.po b/po/es_ES.po index 573dc03..f9c26fe 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1485,7 +1485,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "No es un archivo ISO v��lido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Tardar�� mucho tiempo. ��Desea continuar?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/fr_FR.po b/po/fr_FR.po index 715d612..ad3abb2 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1502,7 +1502,7 @@ msgstr "Aucune ISO d��tect��e" msgid "This is not a valid ISO file." msgstr "Ce n'est pas un fichier ISO valide." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Cela va prendre un long moment. Voulez-vous continuer ?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/it_IT.po b/po/it_IT.po index 1746bed..759f4a2 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1454,7 +1454,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Non �� un file ISO valido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Richieder�� molto tempo. Continuare?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/ja_JP.po b/po/ja_JP.po index f9fe5ee..c28d764 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1463,7 +1463,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "�� ISO ��" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "��?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/kimchi.pot b/po/kimchi.pot index 1923fad..f2456f3 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -1338,7 +1338,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/ko_KR.po b/po/ko_KR.po index 0f6f530..2d01193 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1395,7 +1395,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "�� ISO �� ." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "�� . ��?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/pt_BR.po b/po/pt_BR.po index 898ee5d..10ac33e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1513,7 +1513,7 @@ msgstr "Nenhuma ISO encontrada" msgid "This is not a valid ISO file." msgstr "Esse n��o �� um arquivo ISO v��lido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Isso vai levar um longo tempo. Deseja continuar?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/ru_RU.po b/po/ru_RU.po index fa8d121..8233e99 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1396,7 +1396,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "�� ISO." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "�� . ��?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/zh_CN.po b/po/zh_CN.po index 82d2980..a307e3b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1372,7 +1372,7 @@ msgstr "��ISO��" msgid "This is not a valid ISO file." msgstr "��ISO��" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "��" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/zh_TW.po b/po/zh_TW.po index a12a56e..776bd52 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1343,7 +1343,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "�� ISO ��" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "��" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a4a6dd5..b170d26 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -58,7 +58,7 @@ "KCHTMPL6002E": "$_("This is not a valid ISO file.")", - "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")", + "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", -- 2.1.0

2 4

[PATCH 0/3] *** Improved support for Arch Linux ***
by Alan Jenkins 24 Feb '15

24 Feb '15

Hey guys, These patches improve support for Arch Linux within Kimchi. They add support for detecting the Arch Linux distribution's releases and mark it as a modern distribution to enable Kimchi to automatically turn on support for virtio-net with Arch Linux virtual machines. I however still have yet to find the code that is able to identify a distribution from a disk image, could someone point me in the direction of that code? Thanks, Alan Jenkins Alan Jenkins (3): Add Arch Linux entry to isoinfo. Add modern entry for Arch Linux. Added Arch Icon. src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 2 +- ui/images/icon-arch.png | Bin 0 -> 3868 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 ui/images/icon-arch.png -- 2.2.2

4 18

[PATCH] Set allocation=capacity when creating images in logical pools
by Christy Perez 24 Feb '15

24 Feb '15

If allocation is set to 0 for images in logical storage, they cannot be used. You may see an error similar to: /dev/VMs_Storage_R5/ed229d7b-5248-4499-8758-43069dd79fe7-0.img: \ read failed after 0 of 65536 at 21474770944: Input/output error When attempting to access the image. When using the image, the guest may report that it is unable to write to the disk (I/O error). Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index d4fbe8b..ef41d0a 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -202,8 +202,12 @@ def to_volume_list(self, vm_uuid): 'capacity': d['size'], 'format': fmt, 'path': '%s/%s' % (storage_path, volume)} - info['allocation'] = 0 if fmt in ['qcow2', 'raw'] \ - else info['capacity'] + + if 'logical' == self._get_storage_type() or \ + fmt not in ['qcow2', 'raw']: + info['allocation'] = info['capacity'] + else: + info['allocation'] = 0 if 'base' in d: info['base'] = dict() -- 2.1.0

3 2

[PATCH] Disable SSL on nginx
by Tulio Magno Quites Machado Filho 24 Feb '15

24 Feb '15

This patch helps to protect Kimchi against CVE-2014-3566 by completely disabling SSLv3 on nginx. --- src/nginx.conf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nginx.conf.in b/src/nginx.conf.in index b5d207f..ed926a3 100644 --- a/src/nginx.conf.in +++ b/src/nginx.conf.in @@ -52,6 +52,7 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header X-Frame-Options DENY; -- 2.1.0

3 2

[PATCH] Set Arch Linux PNG image to be used on frontend always.
by Paulo Vital 19 Feb '15

19 Feb '15

Signed-off-by: Paulo Vital <pvital(a)gmail.com> --- ui/css/theme-default/template_add.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/css/theme-default/template_add.css b/ui/css/theme-default/template_add.css index e58bccb..580a3f3 100644 --- a/ui/css/theme-default/template_add.css +++ b/ui/css/theme-default/template_add.css @@ -199,6 +199,11 @@ background-image: url(../../images/icon-gentoo.png); } +.iso-icon.arch { + background-image: url(../../images/icon-arch.png); +} + + .list-iso { overflow: hidden; margin: 5px; -- 2.1.4

3 2

[DISCUSSION] If virbr0 is an existent bridge, libvirt will fail to create default network
by Ramon Medeiros 19 Feb '15

19 Feb '15

Hi Team, i got this issue on https://github.com/kimchi-project/kimchi/issues/556. What we can do: 1) The fix seems to be upstream. But not sure if it will be available soon 2) Run a check, like we do for subnet, to see if it's already created. If not, we can created it and pass to libvirt. -- Ramon Nunes Medeiros Kimchi Developer Software Engineer - Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 3

[PATCH] Remove Non-ASCII chars from tests when unnecessary
by Christy Perez 16 Feb '15

16 Feb '15

A domain with non-ASCII characters will fail to start. There are several tests that use such characters, and these tests fail. None of the failing tests are required to test the validity of non-ascii characters, so it's best to remove them and create seperate tests explicitly for these chracters. This way we will not be masking actual issues by ignoring an expected failure. The issue was first noticed with libvirt 1.1.3. The character issue is discussed in this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1062943 Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- tests/test_model.py | 113 +++++++++++++++++++++++++++----------- tests/test_model_network.py | 6 +- tests/test_model_storagepool.py | 26 +++++++++ tests/test_model_storagevolume.py | 1 - 4 files changed, 113 insertions(+), 33 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index f80f1c9..aa265f5 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -96,6 +96,45 @@ def test_vm_info(self): self.assertEquals([], info['groups']) self.assertTrue(info['persistent']) + + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + def test_non_ascii_vm_name(self): + inst = model.Model(objstore_loc=self.tmp_store) + + with RollbackContext() as rollback: + vol_params = {'name': u'test-vol', 'capacity': 1024} + task = inst.storagevolumes_create(u'default', vol_params) + rollback.prependDefer(inst.storagevolume_delete, u'default', + vol_params['name']) + inst.task_wait(task['id']) + task = inst.task_lookup(task['id']) + self.assertEquals('finished', task['status']) + vol = inst.storagevolume_lookup(u'default', vol_params['name']) + + # Create template + params = {'name': 'test', 'disks': [{'base': vol['path'], + 'size': 1}], + 'cdrom': self.kimchi_iso} + inst.templates_create(params) + rollback.prependDefer(inst.template_delete, 'test') + + # Create VM with non-ascii char name + params = {'name': u'пeω-∨м', 'template': '/templates/test'} + inst.vms_create(params) + rollback.prependDefer(inst.vm_delete, u'пeω-∨м') + + vms = inst.vms_get_list() + self.assertTrue(u'пeω-∨м' in vms) + + # Start VM + # Note: This fails with libvirt > 1.1.3 + inst.vm_start(u'пeω-∨м') + info = inst.vm_lookup(u'пeω-∨м') + self.assertEquals('running', info['state']) + + vms = inst.vms_get_list() + self.assertFalse(u'пeω-∨м' in vms) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_lifecycle(self): inst = model.Model(objstore_loc=self.tmp_store) @@ -620,6 +659,18 @@ def test_template_storage_customise(self): params = {'storagepool': '/storagepools/default'} inst.template_update('test', params) + def test_non_ascii_template_create(self): + inst = model.Model('test:///default', + objstore_loc=self.tmp_store) + + with RollbackContext() as rollback: + params = {'name': u'пeω-teмplate', 'memory': 1024, 'cpus': 1, + 'cdrom': self.kimchi_iso} + inst.templates_create(params) + rollback.prependDefer(inst.template_delete, u'пeω-teмplate') + info = inst.template_lookup(u'пeω-teмplate') + self.assertEquals(info['name'], u'пeω-teмplate') + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_create(self): inst = model.Model('test:///default', @@ -737,7 +788,7 @@ def test_template_update(self): inst.network_activate(net_name) rollback.prependDefer(inst.network_deactivate, net_name) - net_name = u'kīмсhī-пet' + net_name = u'kimchi-net' net_args = {'name': net_name, 'connection': 'nat', 'subnet': '127.0.20.0/24'} @@ -764,7 +815,7 @@ def test_template_update(self): self.assertEquals("default", info["networks"][0]) params = {'name': 'new-test', 'memory': 1024, 'cpus': 1, - 'networks': ['default', 'test-network', u'kīмсhī-пet']} + 'networks': ['default', 'test-network', u'kimchi-net']} inst.template_update('new-test', params) info = inst.template_lookup('new-test') for key in params.keys(): @@ -792,7 +843,7 @@ def test_template_update(self): self.assertEquals('some-vm', inst.vms_create(params)) rollback.prependDefer(inst.vm_delete, 'some-vm') - iface_args = {'type': 'network', 'network': u'kīмсhī-пet'} + iface_args = {'type': 'network', 'network': u'kimchi-net'} mac = inst.vmifaces_create('some-vm', iface_args) self.assertEquals(17, len(mac)) @@ -865,52 +916,52 @@ def test_vm_edit(self): self.assertRaises(OperationFailed, inst.vm_update, 'kimchi-vm1', {'name': 'kimchi-vm2'}) - params = {'name': u'пeω-∨м', 'cpus': 4, 'memory': 2048} + params = {'name': u'new-vm', 'cpus': 4, 'memory': 2048} inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, - u'пeω-∨м') - self.assertEquals(info['uuid'], inst.vm_lookup(u'пeω-∨м')['uuid']) - info = inst.vm_lookup(u'пeω-∨м') + u'new-vm') + self.assertEquals(info['uuid'], inst.vm_lookup(u'new-vm')['uuid']) + info = inst.vm_lookup(u'new-vm') for key in params.keys(): self.assertEquals(params[key], info[key]) # change only VM users - groups are not changed (default is empty) users = inst.users_get_list()[:3] - inst.vm_update(u'пeω-∨м', {'users': users}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['groups']) + inst.vm_update(u'new-vm', {'users': users}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals([], inst.vm_lookup(u'new-vm')['groups']) # change only VM groups - users are not changed (default is empty) groups = inst.groups_get_list()[:2] - inst.vm_update(u'пeω-∨м', {'groups': groups}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals(groups, inst.vm_lookup(u'пeω-∨м')['groups']) + inst.vm_update(u'new-vm', {'groups': groups}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups by adding a new element to each one users.append(pwd.getpwuid(os.getuid()).pw_name) groups.append(grp.getgrgid(os.getgid()).gr_name) - inst.vm_update(u'пeω-∨м', {'users': users, 'groups': groups}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals(groups, inst.vm_lookup(u'пeω-∨м')['groups']) + inst.vm_update(u'new-vm', {'users': users, 'groups': groups}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users (wrong value) and groups # when an error occurs, everything fails and nothing is changed - self.assertRaises(InvalidParameter, inst.vm_update, u'пeω-∨м', + self.assertRaises(InvalidParameter, inst.vm_update, u'new-vm', {'users': ['userdoesnotexist'], 'groups': []}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals(groups, inst.vm_lookup(u'пeω-∨м')['groups']) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups (wrong value) # when an error occurs, everything fails and nothing is changed - self.assertRaises(InvalidParameter, inst.vm_update, u'пeω-∨м', + self.assertRaises(InvalidParameter, inst.vm_update, u'new-vm', {'users': [], 'groups': ['groupdoesnotexist']}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals(groups, inst.vm_lookup(u'пeω-∨м')['groups']) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups by removing all elements - inst.vm_update(u'пeω-∨м', {'users': [], 'groups': []}) - self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['groups']) + inst.vm_update(u'new-vm', {'users': [], 'groups': []}) + self.assertEquals([], inst.vm_lookup(u'new-vm')['users']) + self.assertEquals([], inst.vm_lookup(u'new-vm')['groups']) def test_multithreaded_connection(self): def worker(): @@ -1090,19 +1141,19 @@ def test_delete_running_vm(self): inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') - params = {'name': u'kīмсhī-∨м', 'template': u'/templates/test'} + params = {'name': 'kimchi-vm', 'template': u'/templates/test'} inst.vms_create(params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, - u'kīмсhī-∨м') + 'kimchi-vm') - inst.vm_start(u'kīмсhī-∨м') + inst.vm_start('kimchi-vm') rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, - u'kīмсhī-∨м') + 'kimchi-vm') - inst.vm_delete(u'kīмсhī-∨м') + inst.vm_delete('kimchi-vm') vms = inst.vms_get_list() - self.assertFalse(u'kīмсhī-∨м' in vms) + self.assertFalse('kimchi-vm' in vms) @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_list_sorted(self): diff --git a/tests/test_model_network.py b/tests/test_model_network.py index 5dbe54d..c61f37c 100644 --- a/tests/test_model_network.py +++ b/tests/test_model_network.py @@ -99,6 +99,10 @@ class NetworkTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) + def test_non_ascii_net_names(self): + net = {'name': u'kīмсhī-пet', 'connection': 'isolated'} + _do_network_test(self, model, net) + def test_get_networks(self): networks = json.loads(self.request('/networks').read()) self.assertIn('default', [net['name'] for net in networks]) @@ -127,7 +131,7 @@ def test_get_networks(self): def test_network_lifecycle(self): # Verify all the supported network type - networks = [{'name': u'kīмсhī-пet', 'connection': 'isolated'}, + networks = [{'name': u'kimchi-net', 'connection': 'isolated'}, {'name': u'nat-network', 'connection': 'nat'}, {'name': u'subnet-network', 'connection': 'nat', 'subnet': '127.0.100.0/24'}] diff --git a/tests/test_model_storagepool.py b/tests/test_model_storagepool.py index eabf875..35c62fc 100644 --- a/tests/test_model_storagepool.py +++ b/tests/test_model_storagepool.py @@ -60,6 +60,32 @@ class StoragepoolTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) + def test_non_ascii_storagepool_name(self): + storagepools = json.loads(self.request('/storagepools').read()) + self.assertIn('default', [pool['name'] for pool in storagepools]) + + with RollbackContext() as rollback: + name = u'kīмсhī-storagepool' + req = json.dumps({'name': name, 'type': 'dir', + 'path': '/var/lib/libvirt/images/test_pool'}) + resp = self.request('/storagepools', req, 'POST') + rollback.prependDefer(model.storagepool_delete, name) + + self.assertEquals(201, resp.status) + + # Verify pool information + resp = self.request('/storagepools/%s' % name.encode("utf-8")) + p = json.loads(resp.read()) + keys = [u'name', u'state', u'capacity', u'allocated', + u'available', u'path', u'source', u'type', + u'nr_volumes', u'autostart', u'persistent'] + self.assertEquals(sorted(keys), sorted(p.keys())) + self.assertEquals(name, p['name']) + resp = self.request('/storagepools/%s/activate' % name.encode('utf-8'), req, 'POST') + rollback.prependDefer(model.storagepool_deactivate, name) + p = json.loads(resp.read()) + self.assertEquals('active', p['state']) + def test_get_storagepools(self): storagepools = json.loads(self.request('/storagepools').read()) self.assertIn('default', [pool['name'] for pool in storagepools]) diff --git a/tests/test_model_storagevolume.py b/tests/test_model_storagevolume.py index a3c3ce3..39531e9 100644 --- a/tests/test_model_storagevolume.py +++ b/tests/test_model_storagevolume.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Project Kimchi # -- 2.1.0

1 1

Scrum meeting on Feb. 18th cancelled
by Aline Manera 13 Feb '15

13 Feb '15

Hi folks, As I mentioned in the last scrum meeting, I will be out next week for the Linux Foundation Collaboration Summit where I will do a presentation about Kimchi. Because that we will not have the usual scrum meeting on Feb 18th. Regards, Aline Manera

1 0

[PATCH 0/2] Issue #556: Unable to create bridge virbr0: File already exists
by Ramon Medeiros 12 Feb '15

12 Feb '15

Discovery which bridge is available and pass it when creating the default network pool. Ramon Medeiros (2): Implement function to discover which bridge name is available Pass bridge name on NAT network creation src/kimchi/model/networks.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) -- 1.8.3.1

1 2

[PATCH] Fix issue #589: Add listener to remove Kimchi leftovers
by Aline Manera 12 Feb '15

12 Feb '15

If Kimchi is stopped before it gets completely up, it can leave some leftovers on system due the Feature tests. So add a listener to cherrypy server to clean up any leftovers when server is stopped. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/kvmusertests.py | 19 ++++++++----------- src/kimchi/model/config.py | 27 +++++++++++++++++++++++++-- src/kimchi/model/featuretests.py | 21 +++++++++++++-------- 3 files changed, 46 insertions(+), 21 deletions(-) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 408706d..37a80d7 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -18,18 +18,18 @@ import platform import psutil -import uuid import libvirt from kimchi.rollbackcontext import RollbackContext +KVMUSERTEST_VM_NAME = "KVMUSERTEST_VM" + class UserTests(object): SIMPLE_VM_XML = """ <domain type='kvm'> - <name>%(vm_name)s</name> - <uuid>%(vm_uuid)s</uuid> + <name>%(name)s</name> <memory unit='KiB'>262144</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -43,22 +43,19 @@ class UserTests(object): if cls.user: return cls.user - vm_uuid = uuid.uuid1() - vm_name = "kimchi_test_%s" % vm_uuid arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() - xml = cls.SIMPLE_VM_XML % {'vm_name': vm_name, 'vm_uuid': vm_uuid, - 'arch': arch} + xml = cls.SIMPLE_VM_XML % {'name': KVMUSERTEST_VM_NAME, 'arch': arch} with RollbackContext() as rollback: conn = libvirt.open(None) rollback.prependDefer(conn.close) - dom = conn.defineXML(xml) - rollback.prependDefer(dom.undefine) - dom.create() + dom = conn.createXML(xml, + flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) rollback.prependDefer(dom.destroy) - with open('/var/run/libvirt/qemu/%s.pid' % vm_name) as f: + filename = '/var/run/libvirt/qemu/%s.pid' % KVMUSERTEST_VM_NAME + with open(filename) as f: pidStr = f.read() p = psutil.Process(int(pidStr)) diff --git a/src/kimchi/model/config.py b/src/kimchi/model/config.py index 6a7df41..1c43360 100644 --- a/src/kimchi/model/config.py +++ b/src/kimchi/model/config.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -27,7 +27,8 @@ from kimchi.config import find_qemu_binary, get_version from kimchi.distroloader import DistroLoader from kimchi.exception import NotFoundError from kimchi.model.debugreports import DebugReportsModel -from kimchi.model.featuretests import FeatureTests +from kimchi.model.featuretests import FeatureTests, FEATURETEST_POOL_NAME +from kimchi.model.featuretests import FEATURETEST_VM_NAME from kimchi.repositories import Repositories from kimchi.screenshot import VMScreenshot from kimchi.swupdate import SoftwareUpdate @@ -61,6 +62,28 @@ class CapabilitiesModel(object): # It is needed because some features tests depends on the server cherrypy.engine.subscribe('start', self._set_capabilities) + # Subscribe function to clean any Kimchi leftovers + cherrypy.engine.subscribe('stop', self._clean_leftovers) + + def _clean_leftovers(self): + conn = self.conn.get() + FeatureTests.disable_libvirt_error_logging() + try: + dom = conn.lookupByName(FEATURETEST_VM_NAME) + dom.undefine() + except Exception: + # Any exception can be ignored here + pass + + try: + pool = conn.storagePoolLookupByName(FEATURETEST_POOL_NAME) + pool.undefine() + except Exception: + # Any exception can be ignored here + pass + + FeatureTests.enable_libvirt_error_logging() + def _set_capabilities(self): kimchi_log.info("*** Running feature tests ***") conn = self.conn.get() diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index 5a45990..6ffdf4a 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -25,17 +25,19 @@ import socket import subprocess import threading - from lxml.builder import E - from kimchi.rollbackcontext import RollbackContext from kimchi.utils import kimchi_log, run_command +FEATURETEST_VM_NAME = "FEATURETEST_VM" +FEATURETEST_POOL_NAME = "FEATURETEST_POOL" + + ISO_STREAM_XML = """ <domain type='%(domain)s'> - <name>ISO_STREAMING</name> + <name>%(name)s</name> <memory unit='KiB'>1048576</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -57,7 +59,7 @@ ISO_STREAM_XML = """ SIMPLE_VM_XML = """ <domain type='%(domain)s'> - <name>A_SIMPLE_VM</name> + <name>%(name)s</name> <memory unit='KiB'>10240</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -67,7 +69,7 @@ SIMPLE_VM_XML = """ SCSI_FC_XML = """ <pool type='scsi'> - <name>TEST_SCSI_FC_POOL</name> + <name>%(name)s</name> <source> <adapter type='fc_host' wwnn='1234567890abcdef' wwpn='abcdef1234567890'/> </source> @@ -105,7 +107,8 @@ class FeatureTests(object): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() - xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol, + xml = ISO_STREAM_XML % {'name': FEATURETEST_VM_NAME, + 'domain': domain_type, 'protocol': protocol, 'arch': arch} try: FeatureTests.disable_libvirt_error_logging() @@ -176,7 +179,8 @@ class FeatureTests(object): try: FeatureTests.disable_libvirt_error_logging() pool = None - pool = conn.storagePoolDefineXML(SCSI_FC_XML, 0) + pool_xml = SCSI_FC_XML % {'name': FEATURETEST_POOL_NAME} + pool = conn.storagePoolDefineXML(pool_xml, 0) except libvirt.libvirtError as e: if e.get_error_code() == 27: # Libvirt requires adapter name, not needed when supports to FC @@ -196,7 +200,8 @@ class FeatureTests(object): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() - dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, + dom = conn.defineXML(SIMPLE_VM_XML % {'name': FEATURETEST_VM_NAME, + 'domain': domain_type, 'arch': arch}) rollback.prependDefer(dom.undefine) try: -- 2.1.0

3 3

[PATCH] Fix issue #591: Get the right arch for MockModel
by Aline Manera 12 Feb '15

12 Feb '15

Use osinfo information to get the properly arch information when creating a VM for feature tests. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/featuretests.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index 5a45990..c9a0c78 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -20,15 +20,13 @@ import cherrypy import libvirt import lxml.etree as ET -import platform import socket import subprocess import threading - from lxml.builder import E - +from kimchi import osinfo from kimchi.rollbackcontext import RollbackContext from kimchi.utils import kimchi_log, run_command @@ -103,8 +101,8 @@ class FeatureTests(object): @staticmethod def libvirt_supports_iso_stream(conn, protocol): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - arch = 'ppc64' if platform.machine() == 'ppc64le' \ - else platform.machine() + arch = osinfo.defaults['arch'] + arch = 'ppc64' if arch == 'ppc64le' else arch xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol, 'arch': arch} try: @@ -194,8 +192,8 @@ class FeatureTests(object): FeatureTests.disable_libvirt_error_logging() rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - arch = 'ppc64' if platform.machine() == 'ppc64le' \ - else platform.machine() + arch = osinfo.defaults['arch'] + arch = 'ppc64' if arch == 'ppc64le' else arch dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, 'arch': arch}) rollback.prependDefer(dom.undefine) -- 2.1.0

2 2

Question about KVM domain not available on trusty
by Thierry Fauck＠linux.vnet.ibm.com 11 Feb '15

11 Feb '15

I forgot, on trusty, qemu-kvm doesn't exist as is, and when I try to create a template I get errors like: libvirt: QEMU Driver error : unsupported configuration: Domain requires KVM, but it is not available. Check that virtualization is enabled in the host BIOS, and host configuration is setup to load the kvm modules. So 2 issues there - in trusty get a proper qemu version to avoid messages error: internal error: process exited while connecting to monitor: Warning: Disabling some instructions which are not emulated by TCG (0x0, 0x4) qemu: hardware error: qemu: could not load LPAR rtas '(null)' - in kimchi, detect if kvm not a valid domain type then use qemu Does that sound an issue ? - do you want me to code that ? Thanks -- Thierry Fauck @ linux.vnet.ibm

3 4

[PATCH V3] UI: Add widget messagebar with sample
by Wen Wang 11 Feb '15

11 Feb '15

V2 -> V3: Rename the sample file and add the license. V1 -> V2: Add a parameter "dismissTime" that allow delay time as well as "never" for the dismiss time. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/messagebar-flat.css | 64 ++++++++++++++++++++++++++++ ui/js/widgets/messagebar-flat.js | 71 ++++++++++++++++++++++++++++++++ ui/js/widgets/samples/messagebar.html | 49 ++++++++++++++++++++++ 3 files changed, 184 insertions(+) create mode 100644 ui/css/theme-default/messagebar-flat.css create mode 100644 ui/js/widgets/messagebar-flat.js create mode 100644 ui/js/widgets/samples/messagebar.html diff --git a/ui/css/theme-default/messagebar-flat.css b/ui/css/theme-default/messagebar-flat.css new file mode 100644 index 0000000..d5efc8e --- /dev/null +++ b/ui/css/theme-default/messagebar-flat.css @@ -0,0 +1,64 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.messagebar { + height: 30px; +} + +.messagebar .messagebar-text { + text-align: left; + vertical-align: 50%; +} + +.messagebar .messageHead { + display: inline-block; + width: 5px; + height: 30px; +} + +.messagebar-close { + line-height: 30px; + vertical-align: middle; + margin-right: 10px; + cursor: pointer; + float: right; +} + +.green { + background-color: #DAE6CB; +} + +.dark-green { + background-color: #89C53A; +} + +.yellow { + background-color: #F1E3C2; +} + +.dark-yellow { + background-color: #FDB60D; +} + +.red { + background-color: #EAC3C7; +} + +.dark-red { + background-color: #D81227; +} \ No newline at end of file diff --git a/ui/js/widgets/messagebar-flat.js b/ui/js/widgets/messagebar-flat.js new file mode 100644 index 0000000..203d194 --- /dev/null +++ b/ui/js/widgets/messagebar-flat.js @@ -0,0 +1,71 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* +* Usage: + $(selector).messagebarFlat({ + content: "Test", //message you want to show in the messagebar + color: "red", //Three color supported: "red", "yellow" and "green", + dismissTime: 3000 //when set to "never", the messagebar will never disappear. + // Or setting it to numbers for the dismiss time you want to delay. + }); +*/ + +(function($) { + $.widget("kimchi.messagebarFlat", { + options : { + content : null, + color : "red", + dismissTime: 3000 + }, + + _create: function() { + var now = this._getTime(); + var that = this; + $("<div class='messagebar'><span class='messageHead'></span>" + + "<span class='messagebar-text'> " + this.options.content +": " + now + "</span></div>") + .addClass(this.options.color) + .appendTo(that.element); + $(".messageHead").addClass("dark-" + this.options.color); + $("<span class='messagebar-close icon-cancel-circled'></span>").on("click", function() { + that.destroy(); + }).appendTo($(".messagebar")); + var dismissDelay = this.options.dismissTime; + if (dismissDelay != "never") { + setTimeout(function() { + that.destroy() + }, dismissDelay); + } + }, + + _getTime: function() { + var CT = new Date(); + var currentDate = CT.getDate() + "/" + CT.getMonth()+1 + "/" +CT.getFullYear(); + var currentTime = CT.getHours() + ":" + CT.getMinutes() + ":" + CT.getSeconds(); + var now = currentDate + " " + currentTime; + return now; + }, + + destroy: function() { + var that = this; + that.element.fadeOut("normal", function() { + that.element.remove(); + }); + } + }); +})(jQuery); \ No newline at end of file diff --git a/ui/js/widgets/samples/messagebar.html b/ui/js/widgets/samples/messagebar.html new file mode 100644 index 0000000..b0aa600 --- /dev/null +++ b/ui/js/widgets/samples/messagebar.html @@ -0,0 +1,49 @@ + + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Sample of messagebar</title> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> + <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> + <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/messagebar-flat.css"> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../messagebar-flat.js"></script> + </head> + <body> + <div class="message"></div> + <script> + $(document).ready(function() { + $(".message").messagebarFlat({ + content: "This is a test", + color: "red", + dismissTime: 1000 + }); + }); + </script> + </body> + +</html> -- 2.1.0

3 3

[PATCH] Old version of ppc64_cpu command doesn't support option --threads-per-core
by thierry＠linux.vnet.ibm.com 10 Feb '15

10 Feb '15

From: Thierry FAUCK - IBM LTC <thierry(a)linux.vnet.ibm.com> Old version of ppc64_cpu command doesn't support option --threads-per-core and raises a start message ValueError: invalid literal for int() with base 10: 'information)' Solution is to get info from lscpu which sounds accurate Remove dependency to qemu-kvm Signed-off-by: Thierry FAUCK - IBM LTC <thierry(a)linux.vnet.ibm.com> modified: contrib/DEBIAN/control.in modified: src/kimchi/model/cpuinfo.py --- contrib/DEBIAN/control.in | 1 - src/kimchi/model/cpuinfo.py | 20 +++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 069e14b..776b033 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,7 +14,6 @@ Depends: python-cherrypy3 (>= 3.2.0), libvirt-bin, nfs-common, python-m2crypto, - qemu-kvm, python-pam, python-parted, python-psutil (>= 0.6.0), diff --git a/src/kimchi/model/cpuinfo.py b/src/kimchi/model/cpuinfo.py index 3411ef5..d43f21f 100644 --- a/src/kimchi/model/cpuinfo.py +++ b/src/kimchi/model/cpuinfo.py @@ -80,11 +80,21 @@ class CPUInfoModel(object): out, error, rc = run_command(['ppc64_cpu', '--cores-on']) if not rc: self.cores_available = int(out.split()[-1]) - out, error, rc = run_command(['ppc64_cpu', '--threads-per-core']) - if not rc: - self.threads_per_core = int(out.split()[-1]) - self.sockets = self.cores_present/self.threads_per_core - self.cores_per_socket = self.cores_present/self.sockets + try: + out, error, rc = run_command(['ppc64_cpu', '--threads-per-core']) + if not rc: + self.threads_per_core = int(out.split()[-1]) + self.sockets = self.cores_present/self.threads_per_core + self.cores_per_socket = self.cores_present/self.sockets + except: + out, error, rc = run_command(['sh', '-c', 'lscpu | + grep "Thread(s) per core:"']) + if not rc: + self.cores_present = int(out.split()[-1]) + out, error, rc = run_command(['sh', '-c', 'lscpu | + grep "Core(s) per socket:"']) + if not rc: + self.cores_available = int(out.split()[-1]) else: # Intel or AMD self.guest_threads_enabled = True -- 1.7.9.5

4 4

[PATCH] Eliminate name collision for feature tests' VMs
by Christy Perez 06 Feb '15

06 Feb '15

If Kimchi's startup is interrupted for some reason, a VM created during the feature tests may be left defined. When this happens, the next time Kimchi is started it will fail with an error that the domain already exists (for example, "libvirtError: operation failed: domain 'A_SIMPLE_VM' already exists with uuid e6fccea8-f7ed-4320-a4cb-b85217d23985"). This patch just uses the same uuid-based name scheme as was already in the user tests (kvmusertests.py). That gives a miniscule chance for name collision. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/featuretests.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index 5a45990..aa8d709 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -24,6 +24,7 @@ import socket import subprocess import threading +import uuid from lxml.builder import E @@ -35,7 +36,7 @@ ISO_STREAM_XML = """ <domain type='%(domain)s'> - <name>ISO_STREAMING</name> + <name>'%(name)s'</name> <memory unit='KiB'>1048576</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -57,7 +58,7 @@ SIMPLE_VM_XML = """ <domain type='%(domain)s'> - <name>A_SIMPLE_VM</name> + <name>'%(name)s'</name> <memory unit='KiB'>10240</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -105,8 +106,10 @@ def libvirt_supports_iso_stream(conn, protocol): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() + vm_uuid = uuid.uuid1() + vm_name = "ISO_STREAM_%s" % vm_uuid xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol, - 'arch': arch} + 'arch': arch, 'name': vm_name} try: FeatureTests.disable_libvirt_error_logging() dom = conn.defineXML(xml) @@ -196,8 +199,11 @@ def has_metadata_support(conn): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() + vm_uuid = uuid.uuid1() + vm_name = "A_SIMPLE_VM_%s" % vm_uuid dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, - 'arch': arch}) + 'arch': arch, + 'name': vm_name}) rollback.prependDefer(dom.undefine) try: dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, -- 1.9.3

2 5

Doubt Bug 121401 - LTCTest: Build36: Takes time to list "Device path" for logical pool creation
by Ramon Medeiros 06 Feb '15

06 Feb '15

Hi Team, i was debugging this bug and found that this query is taking so much time: pvs = subprocess.Popen( ["pvs", "--unbuffered", "--nameprefixes", "--noheadings", "-o", "vg_name", devNodePath], devNodePath is a partition or a disk (e.g. /dev/sdc or /dev/mpathe1) The goal in this command is search the volume group that this partition belongs to. On machines that has inconsistent volume groups, it takes a long time to retrieve the information. Can i cache this information before querying all partitions? Or there is other way to query this info faster? -- Ramon Nunes Medeiros Kimchi Developer Software Engineer - Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 2

[PATCH] Issue #569: Deactive logical pool cause vm failed to start
by gouzongmei＠163.com 06 Feb '15

06 Feb '15

From: Zongmei Gou <gouzongmei(a)163.com> Deactive logical pool cause vm failed to start while storage of the vm is in this logical pool. Storage pool's "deactive" action call libvirt "StoragePoolDestroy" function which causes different result on different pool type.Once the pool is destroyed, the 'dir' type pool remains its target path and images while the 'logical' type pool deletes its target path and images. This patch make deactive logical pool action failed while exists vm(s) linked to this pool. --- src/kimchi/i18n.py | 1 + src/kimchi/model/storagepools.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 4ab08d1..08bfe38 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -188,6 +188,7 @@ messages = { "KCHPOOL0035E": _("Unable to delete pool %(name)s as it is associated with some templates"), "KCHPOOL0036E": _("A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool."), "KCHPOOL0037E": _("Unable to update database with deep scan information due error: %(err)s"), + "KCHPOOL0038E": _("Unable to deactivate pool %(name)s. There are some virtual machines %(vms)s linked to this pool."), "KCHVOL0001E": _("Storage volume %(name)s already exists"), "KCHVOL0002E": _("Storage volume %(name)s does not exist in storage pool %(pool)s"), diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index b85f3b4..c42b62e 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import libvirt +import os from kimchi.scan import Scanner from kimchi.exception import InvalidOperation, MissingParameter @@ -27,6 +28,8 @@ from kimchi.model.host import DeviceModel from kimchi.model.libvirtstoragepool import StoragePoolDef from kimchi.utils import add_task, kimchi_log, pool_name_from_uri, run_command from kimchi.xmlutils.utils import xpath_get_text +from kimchi.model.vms import VMModel, VMsModel +from kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks ISO_POOL_NAME = u'kimchi_isos' @@ -230,6 +233,24 @@ class StoragePoolModel(object): source[key] = res return source + def _get_vms_attach_to_a_storagepool(self, pool_name): + # find out vm(s) the vol(s) of this pool attached to. + pool = self.get_storagepool(pool_name, self.conn) + xml = pool.XMLDesc(0) + + vms = [] + pool_path = xpath_get_text(xml, "/pool/target/path")[0] + vms_list = VMsModel.get_vms(self.conn) + for vm in vms_list: + dom = VMModel.get_vm(vm, self.conn) + storages = get_vm_disks(dom) + for disk in storages.keys(): + d_info = get_vm_disk_info(dom, disk) + if pool_path == os.path.split(d_info['path'])[0]: + vms.append(vm) + break + return sorted(vms) + def _nfs_status_online(self, pool, poolArgs=None): if not poolArgs: xml = pool.XMLDesc(0) @@ -378,6 +399,13 @@ class StoragePoolModel(object): raise OperationFailed("KCHPOOL0033E", {'name': name, 'server': source['addr']}) return + elif (pool_type == 'logical' and + self._get_storagepool_vols_num(pool) > 0): + # can not deactive if vol(s) exists, because destroy + # logical pool will cause the vol deleted. + vms = self._get_vms_attach_to_a_storagepool(name) + raise InvalidOperation('KCHPOOL0038E', {'name': name, + 'vms': ', '.join(vms)}) try: persistent = pool.isPersistent() pool.destroy() -- 1.8.3.1

2 1

[PATCH v2] Kimchi: Old version of ppc64_cpu command doesn't support option --threads-per-core V2 Correct missing \ in kimchi/model/cpuinfo.py V1 Old version of ppc64_cpu command doesn't support option --threads-per-core and raises a start message ValueError: invalid literal for int() with base 10: 'information)' Solution is to get info from lscpu which sounds accurate
by thierry＠linux.vnet.ibm.com 06 Feb '15

06 Feb '15

From: Thierry FAUCK - IBM LTC <thierry(a)linux.vnet.ibm.com> Remove dependency to qemu-kvm Signed-off-by: Thierry FAUCK - IBM LTC <thierry(a)linux.vnet.ibm.com> modified: contrib/DEBIAN/control.in modified: src/kimchi/model/cpuinfo.py --- contrib/DEBIAN/control.in | 1 - src/kimchi/model/cpuinfo.py | 20 +++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 069e14b..776b033 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,7 +14,6 @@ Depends: python-cherrypy3 (>= 3.2.0), libvirt-bin, nfs-common, python-m2crypto, - qemu-kvm, python-pam, python-parted, python-psutil (>= 0.6.0), diff --git a/src/kimchi/model/cpuinfo.py b/src/kimchi/model/cpuinfo.py index 3411ef5..d43f21f 100644 --- a/src/kimchi/model/cpuinfo.py +++ b/src/kimchi/model/cpuinfo.py @@ -80,11 +80,21 @@ class CPUInfoModel(object): out, error, rc = run_command(['ppc64_cpu', '--cores-on']) if not rc: self.cores_available = int(out.split()[-1]) - out, error, rc = run_command(['ppc64_cpu', '--threads-per-core']) - if not rc: - self.threads_per_core = int(out.split()[-1]) - self.sockets = self.cores_present/self.threads_per_core - self.cores_per_socket = self.cores_present/self.sockets + try: + out, error, rc = run_command(['ppc64_cpu', '--threads-per-core']) + if not rc: + self.threads_per_core = int(out.split()[-1]) + self.sockets = self.cores_present/self.threads_per_core + self.cores_per_socket = self.cores_present/self.sockets + except: + out, error, rc = run_command(['sh', '-c', 'lscpu | + grep "Thread(s) per core:"']) + if not rc: + self.cores_present = int(out.split()[-1]) + out, error, rc = run_command(['sh', '-c', 'lscpu | + grep "Core(s) per socket:"']) + if not rc: + self.cores_available = int(out.split()[-1]) else: # Intel or AMD self.guest_threads_enabled = True -- 1.7.9.5

1 0

[PATCH] Make VMs for tests auto-destroy'd and transient
by Christy Perez 06 Feb '15

06 Feb '15

If Kimchi's startup is interrupted for some reason, a VM created during the feature tests may be left defined. When this happens, the next time Kimchi is started it will fail with an error that the domain already exists (for example, "libvirtError: operation failed: domain 'A_SIMPLE_VM' already exists with uuid e6fccea8-f7ed-4320-a4cb-b85217d23985"). About the new flag: "If the VIR_DOMAIN_START_AUTODESTROY flag is set, the guest domain will be automatically destroyed when the virConnectPtr object is finally released. This will also happen if the client application crashes / loses its connection to the libvirtd daemon. Any domains marked for auto destroy will block attempts at migration, save-to-file, or snapshots." This patch also changes the memory in the test VMs, due to the fact that the domain will be started, and some platforms (Power is a known example) require at least 128M of memory for a guest. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/kvmusertests.py | 5 ++--- src/kimchi/model/featuretests.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 408706d..3abf148 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -54,9 +54,8 @@ def probe_user(cls): with RollbackContext() as rollback: conn = libvirt.open(None) rollback.prependDefer(conn.close) - dom = conn.defineXML(xml) - rollback.prependDefer(dom.undefine) - dom.create() + dom = conn.createXML(xml, + flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) rollback.prependDefer(dom.destroy) with open('/var/run/libvirt/qemu/%s.pid' % vm_name) as f: pidStr = f.read() diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index 5a45990..ef7dcc5 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -58,7 +58,7 @@ SIMPLE_VM_XML = """ <domain type='%(domain)s'> <name>A_SIMPLE_VM</name> - <memory unit='KiB'>10240</memory> + <memory unit='KiB'>131072</memory> <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> @@ -109,8 +109,9 @@ def libvirt_supports_iso_stream(conn, protocol): 'arch': arch} try: FeatureTests.disable_libvirt_error_logging() - dom = conn.defineXML(xml) - dom.undefine() + dom = conn.createXML(xml, + flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) + dom.destroy() return True except libvirt.libvirtError, e: kimchi_log.error(e.message) @@ -196,9 +197,10 @@ def has_metadata_support(conn): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() - dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, - 'arch': arch}) - rollback.prependDefer(dom.undefine) + dom = conn.createXML(SIMPLE_VM_XML % {'domain': domain_type, + 'arch': arch}, + flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) + rollback.prependDefer(dom.destroy) try: dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, "<metatest/>", KIMCHI_NAMESPACE, -- 1.9.3

2 2

[PATCH] Bugfix: Kimchi: Better to list storage pool paths
by Wen Wang 05 Feb '15

05 Feb '15

Fix the defect that kimchi could not show the storage path properly when it's too long. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/storage.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index e0ab290..b6df3c2 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -50,7 +50,7 @@ .storage-text { font-size: 12px; - height: 18px; + min-height: 18px; padding: 10px; color: #999999; font-weight: bold; -- 2.1.0

3 3

[PATCH V2] UI: Add widget messagebar with sample
by Wen Wang 05 Feb '15

05 Feb '15

V1 -> V2: Add a parameter "dismissTime" that allow delay time as well as "never" for the dismiss time. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/messagebar-flat.css | 64 ++++++++++++++++++++ ui/js/widgets/messagebar-flat.js | 71 +++++++++++++++++++++++ ui/js/widgets/samples/messagebar-flat-sample.html | 34 +++++++++++ 3 files changed, 169 insertions(+) create mode 100644 ui/css/theme-default/messagebar-flat.css create mode 100644 ui/js/widgets/messagebar-flat.js create mode 100644 ui/js/widgets/samples/messagebar-flat-sample.html diff --git a/ui/css/theme-default/messagebar-flat.css b/ui/css/theme-default/messagebar-flat.css new file mode 100644 index 0000000..d5efc8e --- /dev/null +++ b/ui/css/theme-default/messagebar-flat.css @@ -0,0 +1,64 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.messagebar { + height: 30px; +} + +.messagebar .messagebar-text { + text-align: left; + vertical-align: 50%; +} + +.messagebar .messageHead { + display: inline-block; + width: 5px; + height: 30px; +} + +.messagebar-close { + line-height: 30px; + vertical-align: middle; + margin-right: 10px; + cursor: pointer; + float: right; +} + +.green { + background-color: #DAE6CB; +} + +.dark-green { + background-color: #89C53A; +} + +.yellow { + background-color: #F1E3C2; +} + +.dark-yellow { + background-color: #FDB60D; +} + +.red { + background-color: #EAC3C7; +} + +.dark-red { + background-color: #D81227; +} \ No newline at end of file diff --git a/ui/js/widgets/messagebar-flat.js b/ui/js/widgets/messagebar-flat.js new file mode 100644 index 0000000..203d194 --- /dev/null +++ b/ui/js/widgets/messagebar-flat.js @@ -0,0 +1,71 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* +* Usage: + $(selector).messagebarFlat({ + content: "Test", //message you want to show in the messagebar + color: "red", //Three color supported: "red", "yellow" and "green", + dismissTime: 3000 //when set to "never", the messagebar will never disappear. + // Or setting it to numbers for the dismiss time you want to delay. + }); +*/ + +(function($) { + $.widget("kimchi.messagebarFlat", { + options : { + content : null, + color : "red", + dismissTime: 3000 + }, + + _create: function() { + var now = this._getTime(); + var that = this; + $("<div class='messagebar'><span class='messageHead'></span>" + + "<span class='messagebar-text'> " + this.options.content +": " + now + "</span></div>") + .addClass(this.options.color) + .appendTo(that.element); + $(".messageHead").addClass("dark-" + this.options.color); + $("<span class='messagebar-close icon-cancel-circled'></span>").on("click", function() { + that.destroy(); + }).appendTo($(".messagebar")); + var dismissDelay = this.options.dismissTime; + if (dismissDelay != "never") { + setTimeout(function() { + that.destroy() + }, dismissDelay); + } + }, + + _getTime: function() { + var CT = new Date(); + var currentDate = CT.getDate() + "/" + CT.getMonth()+1 + "/" +CT.getFullYear(); + var currentTime = CT.getHours() + ":" + CT.getMinutes() + ":" + CT.getSeconds(); + var now = currentDate + " " + currentTime; + return now; + }, + + destroy: function() { + var that = this; + that.element.fadeOut("normal", function() { + that.element.remove(); + }); + } + }); +})(jQuery); \ No newline at end of file diff --git a/ui/js/widgets/samples/messagebar-flat-sample.html b/ui/js/widgets/samples/messagebar-flat-sample.html new file mode 100644 index 0000000..5ab4c73 --- /dev/null +++ b/ui/js/widgets/samples/messagebar-flat-sample.html @@ -0,0 +1,34 @@ + + + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Sample of messagebar</title> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> + <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> + <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/messagebar-flat.css"> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../messagebar-flat.js"></script> + </head> + <body> + <div class="message"></div> + <script> + $(document).ready(function() { + $(".message").messagebarFlat({ + content: "This is a test", + color: "red", + dismissTime: 1000 + }); + }); + </script> + </body> + +</html> -- 2.1.0

2 5

[v3 0/2] UI: Tabs Widget(With Sample)
by huoyuxin＠linux.vnet.ibm.com 05 Feb '15

05 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): UI: Customize jQuery UI Tabs Widget UI: Tabs Widget Sample ui/css/theme-default/tabs.css | 46 ++++++++++++++++++++++++++ ui/css/theme-default/theme.css | 50 ++++++++++++++++++++++++++++ ui/js/widgets/samples/tabs.html | 68 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 0 deletions(-) create mode 100644 ui/css/theme-default/tabs.css create mode 100644 ui/css/theme-default/theme.css create mode 100644 ui/js/widgets/samples/tabs.html

2 3

[PATCH 0/2] Dialog widget with sample
by Wen Wang 05 Feb '15

05 Feb '15

Dialog widget with sample Wen Wang (2): UI; Add widget of dialog UI: Sample of dialog widget ui/css/theme-default/dialog-flat.css | 67 +++++++++++++++++++ ui/js/widgets/dialog-flat.js | 120 +++++++++++++++++++++++++++++++++++ ui/js/widgets/samples/dialog.html | 51 +++++++++++++++ 3 files changed, 238 insertions(+) create mode 100644 ui/css/theme-default/dialog-flat.css create mode 100644 ui/js/widgets/dialog-flat.js create mode 100644 ui/js/widgets/samples/dialog.html -- 2.1.0

2 3

[v2 0/2] UI: Grid Widget(with sample)
by huoyuxin＠linux.vnet.ibm.com 05 Feb '15

05 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> v2: add license statements and sample html Yu Xin Huo (2): UI: Grid Widget ui: grid sample ui/css/theme-default/datagrid.css | 63 +++++++++++++++++++++ ui/js/widgets/grid.js | 111 +++++++++++++++++++++++++++++++++++++ ui/js/widgets/samples/grid.html | 80 ++++++++++++++++++++++++++ 3 files changed, 254 insertions(+), 0 deletions(-) create mode 100644 ui/css/theme-default/datagrid.css create mode 100644 ui/js/widgets/grid.js create mode 100644 ui/js/widgets/samples/grid.html

3 7

[PATCH V2 0/2] Dialog widget with sample
by Wen Wang 05 Feb '15

05 Feb '15

Dialog widget with sample Wen Wang (2): UI; Add widget of dialog UI: Sample of dialog widget ui/css/theme-default/dialog-flat.css | 67 +++++++++++++++++++ ui/js/widgets/dialog-flat.js | 120 +++++++++++++++++++++++++++++++++++ ui/js/widgets/samples/dialog.html | 51 +++++++++++++++ 3 files changed, 238 insertions(+) create mode 100644 ui/css/theme-default/dialog-flat.css create mode 100644 ui/js/widgets/dialog-flat.js create mode 100644 ui/js/widgets/samples/dialog.html -- 2.1.0

1 2

[PATCH V3 0/2] Adding widget of list with sample
by Wen Wang 05 Feb '15

05 Feb '15

Adding widget of list with sample Wen Wang (2): UI: Adding new widget of list UI: Sample of list widget ui/css/theme-default/list-flat.css | 83 ++++++++++++++++++++++++++++++++++++++ ui/js/widgets/list-flat.js | 76 ++++++++++++++++++++++++++++++++++ ui/js/widgets/samples/list.html | 45 +++++++++++++++++++++ 3 files changed, 204 insertions(+) create mode 100644 ui/css/theme-default/list-flat.css create mode 100644 ui/js/widgets/list-flat.js create mode 100644 ui/js/widgets/samples/list.html -- 2.1.0

1 2

[PATCH V2 0/2] Add list widget with sample
by Wen Wang 05 Feb '15

05 Feb '15

Add list widget with sample Wen Wang (2): UI: Adding new widget of list UI: Sample of list widget ui/css/theme-default/list-flat.css | 83 ++++++++++++++++++++++++++++++++++++++ ui/js/widgets/list-flat.js | 76 ++++++++++++++++++++++++++++++++++ ui/js/widgets/samples/list.html | 45 +++++++++++++++++++++ 3 files changed, 204 insertions(+) create mode 100644 ui/css/theme-default/list-flat.css create mode 100644 ui/js/widgets/list-flat.js create mode 100644 ui/js/widgets/samples/list.html -- 2.1.0

2 6

[PATCH V3] UI: Sample of menu/button/radio/checkbox/seletmenu/textbox
by Wen Wang 05 Feb '15

05 Feb '15

V2 -> V3: Change the date of the lincense. V1 -> V2: Add lincense. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ...u-button-radio-checkbox-text-select-sample.html | 101 +++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html diff --git a/ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html b/ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html new file mode 100644 index 0000000..ec92dbe --- /dev/null +++ b/ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html @@ -0,0 +1,101 @@ + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Demo</title> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../menu-flat.js"></script> + <script src="../button-flat.js"></script> + <script src="../radio-flat.js"></script> + <script src="../checkbox-flat.js"></script> + <script src="../textbox-flat.js"></script> + <script src="../selectmenu-flat.js"></script> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/menu-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/button-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/radio-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/checkbox-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/textbox-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/selectmenu-flat.css"> + <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> + <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> + </head> + <body> + <div id="menu"></div> + <div style="height:50px"><div id="select"></div></div> + <div class="radio-demo"></div> + <div class="checkbox-demo"></div> + <input class="text-demo"> + <button class="button-demo">submit</button> + <script> + $(document).ready(function() { + $("#menu").menuFlat({ + content: [1,2,3,4,5,6], //Set content of the menu. + icon: "icon-edit-alt", //Set icon of the menu button. + listIconList: ["icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-user"] + //Set icons of the menu list. + // name is optional which set the name of the menu list. + }); + $("#menu0").on("click", function() { + alert("hello"); + }); + $("#menu1").on("click", function() { + console.log("hello"); + }); + $("#select").selectmenuFlat({ + content: [1,2,3,4,5,6], //Set content of the select menu + selected: 2 // set the selected option, starts from "1" + }); + $("#select").selectmenuFlat("value", "4"); //Set value. + var t = $("#select").selectmenuFlat("value"); //Get value + console.log(t); + $(".radio-demo").radioFlat({ + id: "t", //Base id of the radio set. + name: "test", //name of the radio. + whichChecked: 2, //First selected position, starts from 1. + content: ["apple", "banana", "orange", "cherry"] //set the content array. + }); + $(".radio-demo").click(function() { + console.log($(".radio-demo").radioFlat("value")); //this is how to get the value of selected radio value + }); + $(".checkbox-demo").checkboxFlat({ + id: "t", //Checkbox base id. + name: "test", //Checkbox name. + content: ["apple", "banana", "orange", "cherry"], //Contents of the checkbox set. + checked: [1,3] //Set the checked item, which starts with number 1. + }); + $(".checkbox-demo").click(function() { + console.log($(".selector").checkboxFlat("value")); //Get value of the checked checkbox. + }); + $(".text-demo").textboxFlat({ + hint: "hint" + }); + $(".text-demo").css({ + "height": "30px", + "width": "200px" + }); + $(".button-demo").buttonFlat(); + }); + </script> + </body> +</html> \ No newline at end of file -- 2.1.0

1 0

[PATCH V2] UI: Sample of menu/button/radio/checkbox/seletmenu/textbox
by Wen Wang 05 Feb '15

05 Feb '15

V1 -> V2: Add lincense. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ...u-button-radio-checkbox-text-select-sample.html | 101 +++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html diff --git a/ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html b/ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html new file mode 100644 index 0000000..2b97073 --- /dev/null +++ b/ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html @@ -0,0 +1,101 @@ + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Demo</title> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../menu-flat.js"></script> + <script src="../button-flat.js"></script> + <script src="../radio-flat.js"></script> + <script src="../checkbox-flat.js"></script> + <script src="../textbox-flat.js"></script> + <script src="../selectmenu-flat.js"></script> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/menu-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/button-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/radio-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/checkbox-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/textbox-flat.css"> + <link rel="stylesheet" href="../../../css/theme-default/selectmenu-flat.css"> + <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> + <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> + </head> + <body> + <div id="menu"></div> + <div style="height:50px"><div id="select"></div></div> + <div class="radio-demo"></div> + <div class="checkbox-demo"></div> + <input class="text-demo"> + <button class="button-demo">submit</button> + <script> + $(document).ready(function() { + $("#menu").menuFlat({ + content: [1,2,3,4,5,6], //Set content of the menu. + icon: "icon-edit-alt", //Set icon of the menu button. + listIconList: ["icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-user"] + //Set icons of the menu list. + // name is optional which set the name of the menu list. + }); + $("#menu0").on("click", function() { + alert("hello"); + }); + $("#menu1").on("click", function() { + console.log("hello"); + }); + $("#select").selectmenuFlat({ + content: [1,2,3,4,5,6], //Set content of the select menu + selected: 2 // set the selected option, starts from "1" + }); + $("#select").selectmenuFlat("value", "4"); //Set value. + var t = $("#select").selectmenuFlat("value"); //Get value + console.log(t); + $(".radio-demo").radioFlat({ + id: "t", //Base id of the radio set. + name: "test", //name of the radio. + whichChecked: 2, //First selected position, starts from 1. + content: ["apple", "banana", "orange", "cherry"] //set the content array. + }); + $(".radio-demo").click(function() { + console.log($(".radio-demo").radioFlat("value")); //this is how to get the value of selected radio value + }); + $(".checkbox-demo").checkboxFlat({ + id: "t", //Checkbox base id. + name: "test", //Checkbox name. + content: ["apple", "banana", "orange", "cherry"], //Contents of the checkbox set. + checked: [1,3] //Set the checked item, which starts with number 1. + }); + $(".checkbox-demo").click(function() { + console.log($(".selector").checkboxFlat("value")); //Get value of the checked checkbox. + }); + $(".text-demo").textboxFlat({ + hint: "hint" + }); + $(".text-demo").css({ + "height": "30px", + "width": "200px" + }); + $(".button-demo").buttonFlat(); + }); + </script> + </body> +</html> \ No newline at end of file -- 2.1.0

2 2

[kimchi-devel][RFC] Snapshot mockmodel tests fail for RHEL7 and fedora20
by Royce Lv 04 Feb '15

04 Feb '15

Latest added snapshots mockmodel tests fails at RHEL7 and fedora20 because libvirt test model lacks of related support: ====================================================================== ERROR: test_vm_lifecycle (test_rest.RestTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_rest.py", line 92, in setUp model.reset() File "/home/royce/kimchi-2/kimchi/src/kimchi/mockmodel.py", line 133, in reset getattr(self, '%s_delete' % res[:-1])(i) File "/home/royce/kimchi-2/kimchi/src/kimchi/model/vms.py", line 847, in delete snapshot_names = self.vmsnapshots.get_list(name) File "/home/royce/kimchi-2/kimchi/src/kimchi/model/vmsnapshots.py", line 117, in get_list {'vm': vm_name, 'err': e.message}) OperationFailed: KCHSNAP0005E: Unable to list snapshots on virtual machine 'kimchi-test'. Details: this function is not supported by the connection driver: virDomainListAllSnapshots I suggest probe the libvirt version or add feature probe as we do for qemu stream to make sure tests run well on these systems.

5 7

[PATCH] UI: Adding new textbox widget to new kimchi UI
by Wen Wang 04 Feb '15

04 Feb '15

Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/textbox-flat.css | 22 ++++++++++++++++++++ ui/js/widgets/textbox-flat.js | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 ui/css/theme-default/textbox-flat.css create mode 100644 ui/js/widgets/textbox-flat.js diff --git a/ui/css/theme-default/textbox-flat.css b/ui/css/theme-default/textbox-flat.css new file mode 100644 index 0000000..39d5ffb --- /dev/null +++ b/ui/css/theme-default/textbox-flat.css @@ -0,0 +1,22 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + .textbox-container { + border: 1px solid #CCC; + border-radius: 3px; + } \ No newline at end of file diff --git a/ui/js/widgets/textbox-flat.js b/ui/js/widgets/textbox-flat.js new file mode 100644 index 0000000..80192ef --- /dev/null +++ b/ui/js/widgets/textbox-flat.js @@ -0,0 +1,39 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// How to use: +// $(".selector").textboxFlat({ +// hint: "hint" +// }); + + (function($) { + $.widget("kimchi.textboxFlat", { + optons: { + hint: "" + }, + + _create: function() { + this.element.addClass("textbox-container"); + this.element.attr("placeholder", this.options.hint); + }, + + destroy:function() { + this.element.remove(); + } + }); + })(jQuery); \ No newline at end of file -- 2.1.0

2 2

[PATCH] UI: Adding new radio widget of new kimchi UI
by Wen Wang 04 Feb '15

04 Feb '15

Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/radio-flat.css | 30 +++++++++++++ ui/js/widgets/radio-flat.js | 86 +++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 ui/css/theme-default/radio-flat.css create mode 100644 ui/js/widgets/radio-flat.js diff --git a/ui/css/theme-default/radio-flat.css b/ui/css/theme-default/radio-flat.css new file mode 100644 index 0000000..0c03485 --- /dev/null +++ b/ui/css/theme-default/radio-flat.css @@ -0,0 +1,30 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + .radio-label { + position: relative; + cursor: pointer; + } + + .radio-content { + margin-right: 10px; + } + + .inline-radio { + display: inline-block; + } \ No newline at end of file diff --git a/ui/js/widgets/radio-flat.js b/ui/js/widgets/radio-flat.js new file mode 100644 index 0000000..7be55f7 --- /dev/null +++ b/ui/js/widgets/radio-flat.js @@ -0,0 +1,86 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * //How to use: + * $(".selector").radioFlat({ + * id: "t", //Base id of the radio set. + * name: "test", //name of the radio. + * whichChecked: 2, //First selected position, starts from 1. + * content: ["apple", "banana", "orange", "cherry"] //set the content array. + * }); + * + * + * $(".test-bar").click(function() { + * console.log($(".test-bar").radioFlat("value")); //this is how to get the value of selected radio value + * }); + * + * + * + */ + + (function($) { + + $.widget("kimchi.radioFlat", { + options: { + id: "", + name: "", + whichChecked: "", + content:[], + }, + + _create: function() { + var that = this; + var radioName = this.options.name; + var labelID = this.options.id; + var checked = this.options.whichChecked; + var num = Number(this.options.content.length); + var html =""; + if(num >0) { + for(var i=1;i < num+1;i++) { + var tmpLabelID = labelID + i; + html += "<div class='icon-circle-empty inline-radio radio-label' id='" + tmpLabelID + "'></div>" + + "<label class='radio-content inline-radio' for='" + tmpLabelID + "'>" + that.options.content[i-1] + "</label>"; + } + $(html).appendTo(that.element); + $("#" + labelID + checked).attr("checked", "true"); + $("#" + labelID + checked).removeClass("icon-circle-empty"); + $("#" + labelID + checked).addClass("icon-dot-circled"); + } + $(".radio-label").on("click", function() { + $(".radio-label").removeClass("icon-dot-circled"); + $(".radio-label").addClass("icon-circle-empty"); + $(".radio-label").removeAttr("checked"); + $(this).removeClass("icon-circle-empty"); + $(this).addClass("icon-dot-circled"); + $(this).attr("checked", "true"); + var thisID = $(this).attr("id"); + that.options.whichChecked = thisID.substring(labelID.length,thisID.length); + }); + }, + + value: function() { + var value = Number(this.options.whichChecked) -1; + return this.options.content[value]; + }, + + _destroy: function() { + this.element.remove(); + } + }); + })(jQuery); \ No newline at end of file -- 2.1.0

2 2

[PATCH] UI: Sample of dialog widget
by Wen Wang 04 Feb '15

04 Feb '15

Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/widgets/samples/dialog-sample.html | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 ui/js/widgets/samples/dialog-sample.html diff --git a/ui/js/widgets/samples/dialog-sample.html b/ui/js/widgets/samples/dialog-sample.html new file mode 100644 index 0000000..65b77fb --- /dev/null +++ b/ui/js/widgets/samples/dialog-sample.html @@ -0,0 +1,32 @@ + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Dialog Demo</title> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../dialog-flat.js"></script> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/dialog-flat.css"> + <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> + <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> + </head> + <body> + <div class="dialog-demo"></div> + <script> + $(document).ready(function() { + $(".dialog-demo").dialogFlat({ + title: "Demo", //Title of the dialog. + confirmText: "Ok", //Text of the confirm button, "Ok" is the default value. + cancelText: "Cancel", //Text of the cancel button. + width: "600", //Width of the dialog, "px" is the default unit. + height: "500", //Height of the dialog, "px" is the default unit. + confirmFunc: function() { + alert("success");//Function after confirm + } + }); + }); + </script> + </body> +</html> \ No newline at end of file -- 2.1.0

2 2

[v2 0/2] UI: Tabs Widget(With Sample)
by huoyuxin＠linux.vnet.ibm.com 04 Feb '15

04 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): UI: Customize jQuery UI Tabs Widget UI: Tabs Widget Sample ui/css/theme-default/tabs.css | 46 +++++++++++++++++++++++++ ui/css/theme-default/theme.css | 50 +++++++++++++++++++++++++++ ui/js/widgets/samples/tabs.html | 72 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 0 deletions(-) create mode 100644 ui/css/theme-default/tabs.css create mode 100644 ui/css/theme-default/theme.css create mode 100644 ui/js/widgets/samples/tabs.html

3 5

[v2] UI: Add Webfont Icon Library
by huoyuxin＠linux.vnet.ibm.com 03 Feb '15

03 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- COPYING | 5 +- ui/fontello/LICENSE.txt | 66 ++++++++++ ui/fontello/css/animation.css | 85 +++++++++++++ ui/fontello/css/fontello.css | 261 ++++++++++++++++++++++++++++++++++++++++ ui/fontello/font/fontello.eot | Bin 0 -> 42700 bytes ui/fontello/font/fontello.svg | 220 +++++++++++++++++++++++++++++++++ ui/fontello/font/fontello.ttf | Bin 0 -> 42532 bytes ui/fontello/font/fontello.woff | Bin 0 -> 24196 bytes ui/pages/kimchi-ui.html.tmpl | 2 + 9 files changed, 637 insertions(+), 2 deletions(-) create mode 100644 ui/fontello/LICENSE.txt create mode 100644 ui/fontello/css/animation.css create mode 100644 ui/fontello/css/fontello.css create mode 100644 ui/fontello/font/fontello.eot create mode 100644 ui/fontello/font/fontello.svg create mode 100644 ui/fontello/font/fontello.ttf create mode 100644 ui/fontello/font/fontello.woff diff --git a/COPYING b/COPYING index e759833..65fc2b1 100644 --- a/COPYING +++ b/COPYING @@ -3,8 +3,9 @@ The user interface (located in ui/ in this distribution) is governed by the Apache License version 2.0. Except the code under ui/spice-html5 which is imported from spice-html5 project -(http://cgit.freedesktop.org/spice/spice-html5) and under ui/libs which is -imported from JQuery UI (http://jqueryui.com) +(http://cgit.freedesktop.org/spice/spice-html5), under ui/libs which is +imported from JQuery UI (http://jqueryui.com) and under ui/fontello which is +generated by http://fontello.com open source project. The rest of this distribution is governed by the GNU Lesser General Public License version 3. diff --git a/ui/fontello/LICENSE.txt b/ui/fontello/LICENSE.txt new file mode 100644 index 0000000..0effddb --- /dev/null +++ b/ui/fontello/LICENSE.txt @@ -0,0 +1,66 @@ +Font license info + + +## Font Awesome + + Copyright (C) 2012 by Dave Gandy + + Author: Dave Gandy + License: SIL () + Homepage: http://fortawesome.github.com/Font-Awesome/ + + +## Entypo + + Copyright (C) 2012 by Daniel Bruce + + Author: Daniel Bruce + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://www.entypo.com + + +## Elusive + + Copyright (C) 2013 by Aristeides Stathopoulos + + Author: Aristeides Stathopoulos + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://aristeides.com/ + + +## MFG Labs + + Copyright (C) 2012 by Daniel Bruce + + Author: MFG Labs + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://www.mfglabs.com/ + + +## Typicons + + (c) Stephen Hutchings 2012 + + Author: Stephen Hutchings + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://typicons.com/ + + +## Zocial + + Copyright (C) 2012 by Sam Collins + + Author: Sam Collins + License: MIT (http://opensource.org/licenses/mit-license.php) + Homepage: http://zocial.smcllns.com/ + + +## Fontelico + + Copyright (C) 2012 by Fontello project + + Author: Crowdsourced, for Fontello project + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://fontello.com + + diff --git a/ui/fontello/css/animation.css b/ui/fontello/css/animation.css new file mode 100644 index 0000000..ac5a956 --- /dev/null +++ b/ui/fontello/css/animation.css @@ -0,0 +1,85 @@ +/* + Animation example, for spinners +*/ +.animate-spin { + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; + display: inline-block; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@-webkit-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@-o-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@-ms-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} diff --git a/ui/fontello/css/fontello.css b/ui/fontello/css/fontello.css new file mode 100644 index 0000000..d9df9ce --- /dev/null +++ b/ui/fontello/css/fontello.css @@ -0,0 +1,261 @@ +@font-face { + font-family: 'fontello'; + src: url('../font/fontello.eot?99320945'); + src: url('../font/fontello.eot?99320945#iefix') format('embedded-opentype'), + url('../font/fontello.woff?99320945') format('woff'), + url('../font/fontello.ttf?99320945') format('truetype'), + url('../font/fontello.svg?99320945#fontello') format('svg'); + font-weight: normal; + font-style: normal; +} +/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ +/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ +/* +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'fontello'; + src: url('../font/fontello.svg?99320945#fontello') format('svg'); + } +} +*/ + + [class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ +} + +.icon-user:before { content: '\e800'; } /* '' */ +.icon-help-circled:before { content: '\e801'; } /* '' */ +.icon-search:before { content: '\e802'; } /* '' */ +.icon-tag:before { content: '\e803'; } /* '' */ +.icon-dot-2:before { content: '\e804'; } /* '' */ +.icon-arrows-cw:before { content: '\e805'; } /* '' */ +.icon-print:before { content: '\e806'; } /* '' */ +.icon-cancel-circled:before { content: '\e807'; } /* '' */ +.icon-edit-alt:before { content: '\e808'; } /* '' */ +.icon-login:before { content: '\e809'; } /* '' */ +.icon-logout:before { content: '\e80a'; } /* '' */ +.icon-download:before { content: '\e80b'; } /* '' */ +.icon-th-large:before { content: '\e80c'; } /* '' */ +.icon-th:before { content: '\e80d'; } /* '' */ +.icon-th-list:before { content: '\e80e'; } /* '' */ +.icon-star:before { content: '\e80f'; } /* '' */ +.icon-star-empty:before { content: '\e810'; } /* '' */ +.icon-users:before { content: '\e811'; } /* '' */ +.icon-upload:before { content: '\e812'; } /* '' */ +.icon-circle-thin:before { content: '\e813'; } /* '' */ +.icon-dot-circled:before { content: '\e814'; } /* '' */ +.icon-ok:before { content: '\e815'; } /* '' */ +.icon-check-empty-1:before { content: '\e816'; } /* '' */ +.icon-clock-2:before { content: '\e817'; } /* '' */ +.icon-ok-squared:before { content: '\e818'; } /* '' */ +.icon-pin:before { content: '\e820'; } /* '' */ +.icon-eye:before { content: '\e821'; } /* '' */ +.icon-attach:before { content: '\e824'; } /* '' */ +.icon-unlink:before { content: '\e825'; } /* '' */ +.icon-link:before { content: '\e826'; } /* '' */ +.icon-home:before { content: '\e827'; } /* '' */ +.icon-info:before { content: '\e828'; } /* '' */ +.icon-info-circled:before { content: '\e829'; } /* '' */ +.icon-export:before { content: '\e82f'; } /* '' */ +.icon-export-alt:before { content: '\e830'; } /* '' */ +.icon-share:before { content: '\e831'; } /* '' */ +.icon-share-squared:before { content: '\e832'; } /* '' */ +.icon-retweet:before { content: '\e836'; } /* '' */ +.icon-attention-alt:before { content: '\e837'; } /* '' */ +.icon-attention:before { content: '\e838'; } /* '' */ +.icon-attention-circled:before { content: '\e839'; } /* '' */ +.icon-location:before { content: '\e83a'; } /* '' */ +.icon-trash:before { content: '\e83b'; } /* '' */ +.icon-doc:before { content: '\e83c'; } /* '' */ +.icon-docs:before { content: '\e83d'; } /* '' */ +.icon-doc-text:before { content: '\e83e'; } /* '' */ +.icon-doc-inv:before { content: '\e83f'; } /* '' */ +.icon-doc-text-inv:before { content: '\e840'; } /* '' */ +.icon-file-pdf:before { content: '\e841'; } /* '' */ +.icon-file-word:before { content: '\e842'; } /* '' */ +.icon-file-excel:before { content: '\e843'; } /* '' */ +.icon-file-powerpoint:before { content: '\e844'; } /* '' */ +.icon-file-image:before { content: '\e845'; } /* '' */ +.icon-cog:before { content: '\e84b'; } /* '' */ +.icon-cog-alt:before { content: '\e84c'; } /* '' */ +.icon-wrench:before { content: '\e84d'; } /* '' */ +.icon-calendar:before { content: '\e84e'; } /* '' */ +.icon-calendar-empty:before { content: '\e84f'; } /* '' */ +.icon-clock:before { content: '\e852'; } /* '' */ +.icon-block:before { content: '\e853'; } /* '' */ +.icon-zoom-in:before { content: '\e857'; } /* '' */ +.icon-zoom-out:before { content: '\e858'; } /* '' */ +.icon-down-circled2:before { content: '\e859'; } /* '' */ +.icon-up-circled2:before { content: '\e85a'; } /* '' */ +.icon-left-circled2:before { content: '\e85b'; } /* '' */ +.icon-right-circled2:before { content: '\e85c'; } /* '' */ +.icon-down-dir:before { content: '\e85d'; } /* '' */ +.icon-up-dir:before { content: '\e85e'; } /* '' */ +.icon-left-dir:before { content: '\e85f'; } /* '' */ +.icon-right-dir:before { content: '\e860'; } /* '' */ +.icon-down-open:before { content: '\e861'; } /* '' */ +.icon-left-open:before { content: '\e862'; } /* '' */ +.icon-right-open:before { content: '\e863'; } /* '' */ +.icon-up-open:before { content: '\e864'; } /* '' */ +.icon-angle-left:before { content: '\e865'; } /* '' */ +.icon-angle-right:before { content: '\e866'; } /* '' */ +.icon-angle-up:before { content: '\e867'; } /* '' */ +.icon-angle-down:before { content: '\e868'; } /* '' */ +.icon-angle-circled-left:before { content: '\e869'; } /* '' */ +.icon-angle-circled-right:before { content: '\e86a'; } /* '' */ +.icon-angle-circled-up:before { content: '\e86b'; } /* '' */ +.icon-angle-circled-down:before { content: '\e86c'; } /* '' */ +.icon-angle-double-left:before { content: '\e86d'; } /* '' */ +.icon-angle-double-right:before { content: '\e86e'; } /* '' */ +.icon-angle-double-up:before { content: '\e86f'; } /* '' */ +.icon-angle-double-down:before { content: '\e870'; } /* '' */ +.icon-down-big:before { content: '\e871'; } /* '' */ +.icon-left-big:before { content: '\e872'; } /* '' */ +.icon-right-big:before { content: '\e873'; } /* '' */ +.icon-up-big:before { content: '\e874'; } /* '' */ +.icon-left-circled:before { content: '\e875'; } /* '' */ +.icon-right-circled:before { content: '\e876'; } /* '' */ +.icon-up-circled:before { content: '\e877'; } /* '' */ +.icon-down-circled:before { content: '\e878'; } /* '' */ +.icon-cw:before { content: '\e879'; } /* '' */ +.icon-ccw:before { content: '\e87a'; } /* '' */ +.icon-level-up:before { content: '\e87c'; } /* '' */ +.icon-level-down:before { content: '\e87d'; } /* '' */ +.icon-shuffle:before { content: '\e87e'; } /* '' */ +.icon-exchange:before { content: '\e87f'; } /* '' */ +.icon-history:before { content: '\e880'; } /* '' */ +.icon-expand:before { content: '\e881'; } /* '' */ +.icon-collapse:before { content: '\e882'; } /* '' */ +.icon-expand-right:before { content: '\e883'; } /* '' */ +.icon-collapse-left:before { content: '\e884'; } /* '' */ +.icon-play:before { content: '\e885'; } /* '' */ +.icon-play-circled2:before { content: '\e886'; } /* '' */ +.icon-play-circled:before { content: '\e887'; } /* '' */ +.icon-stop:before { content: '\e888'; } /* '' */ +.icon-cloud:before { content: '\e889'; } /* '' */ +.icon-table:before { content: '\e88a'; } /* '' */ +.icon-off:before { content: '\e88b'; } /* '' */ +.icon-check:before { content: '\e88c'; } /* '' */ +.icon-asterisk:before { content: '\e88e'; } /* '' */ +.icon-chart-bar:before { content: '\e88f'; } /* '' */ +.icon-bug:before { content: '\e890'; } /* '' */ +.icon-certificate:before { content: '\e891'; } /* '' */ +.icon-tasks:before { content: '\e892'; } /* '' */ +.icon-sort-up:before { content: '\e893'; } /* '' */ +.icon-sort-down:before { content: '\e894'; } /* '' */ +.icon-sort:before { content: '\e895'; } /* '' */ +.icon-gauge:before { content: '\e896'; } /* '' */ +.icon-spinner:before { content: '\e897'; } /* '' */ +.icon-database:before { content: '\e898'; } /* '' */ +.icon-lifebuoy:before { content: '\e899'; } /* '' */ +.icon-cubes:before { content: '\e89a'; } /* '' */ +.icon-cube:before { content: '\e89b'; } /* '' */ +.icon-bullseye:before { content: '\e89c'; } /* '' */ +.icon-windows:before { content: '\e89d'; } /* '' */ +.icon-cancel-circled-1:before { content: '\e89e'; } /* '' */ +.icon-plus-1:before { content: '\e8a0'; } /* '' */ +.icon-plus-circled-1:before { content: '\e8a1'; } /* '' */ +.icon-minus-1:before { content: '\e8a3'; } /* '' */ +.icon-minus-circled-1:before { content: '\e8a4'; } /* '' */ +.icon-help-circled-1:before { content: '\e8a7'; } /* '' */ +.icon-heart-empty-1:before { content: '\e8aa'; } /* '' */ +.icon-mail-1:before { content: '\e8ab'; } /* '' */ +.icon-star-1:before { content: '\e8ac'; } /* '' */ +.icon-star-empty-1:before { content: '\e8ad'; } /* '' */ +.icon-link-1:before { content: '\e8ae'; } /* '' */ +.icon-attach-1:before { content: '\e8af'; } /* '' */ +.icon-eye-1:before { content: '\e8b2'; } /* '' */ +.icon-attention-1:before { content: '\e8b3'; } /* '' */ +.icon-doc-text-1:before { content: '\e8b4'; } /* '' */ +.icon-doc-text-inv-1:before { content: '\e8b5'; } /* '' */ +.icon-share-1:before { content: '\e8b7'; } /* '' */ +.icon-shareable:before { content: '\e8b8'; } /* '' */ +.icon-ccw-1:before { content: '\e8cc'; } /* '' */ +.icon-cw-1:before { content: '\e8cd'; } /* '' */ +.icon-arrows-ccw:before { content: '\e8ce'; } /* '' */ +.icon-play-1:before { content: '\e8cf'; } /* '' */ +.icon-pause:before { content: '\e8d0'; } /* '' */ +.icon-record:before { content: '\e8d1'; } /* '' */ +.icon-stop-1:before { content: '\e8d2'; } /* '' */ +.icon-switch:before { content: '\e8d3'; } /* '' */ +.icon-loop:before { content: '\e8d4'; } /* '' */ +.icon-cloud-1:before { content: '\e8d5'; } /* '' */ +.icon-certificate-outline:before { content: '\e8db'; } /* '' */ +.icon-certificate-1:before { content: '\e8dc'; } /* '' */ +.icon-windows-1:before { content: '\e8dd'; } /* '' */ +.icon-spin5:before { content: '\e8df'; } /* '' */ +.icon-spin2:before { content: '\e8e0'; } /* '' */ +.icon-picture:before { content: '\e8e4'; } /* '' */ +.icon-menu:before { content: '\e8e5'; } /* '' */ +.icon-sliders:before { content: '\e8e6'; } /* '' */ +.icon-list-alt:before { content: '\e8e7'; } /* '' */ +.icon-ajust:before { content: '\e8e8'; } /* '' */ +.icon-circle:before { content: '\e8e9'; } /* '' */ +.icon-circle-empty:before { content: '\e8ea'; } /* '' */ +.icon-circle-notch:before { content: '\e8ec'; } /* '' */ +.icon-fork:before { content: '\e8ed'; } /* '' */ +.icon-sitemap:before { content: '\e8ee'; } /* '' */ +.icon-stethoscope:before { content: '\e8ef'; } /* '' */ +.icon-shield:before { content: '\e8f0'; } /* '' */ +.icon-heart-1:before { content: '\e8f1'; } /* '' */ +.icon-search-1:before { content: '\e8f2'; } /* '' */ +.icon-menu-1:before { content: '\e8f3'; } /* '' */ +.icon-back:before { content: '\e8f6'; } /* '' */ +.icon-home-1:before { content: '\e8f7'; } /* '' */ +.icon-pencil-1:before { content: '\e8f8'; } /* '' */ +.icon-location-1:before { content: '\e8f9'; } /* '' */ +.icon-logout-1:before { content: '\e8fb'; } /* '' */ +.icon-login-1:before { content: '\e8fc'; } /* '' */ +.icon-publish:before { content: '\e8fd'; } /* '' */ +.icon-window:before { content: '\e8fe'; } /* '' */ +.icon-chart-pie:before { content: '\e8ff'; } /* '' */ +.icon-chart-line:before { content: '\e900'; } /* '' */ +.icon-chart-area:before { content: '\e901'; } /* '' */ +.icon-chart-bar-1:before { content: '\e902'; } /* '' */ +.icon-air:before { content: '\e905'; } /* '' */ +.icon-database-1:before { content: '\e906'; } /* '' */ +.icon-flow-cascade:before { content: '\e907'; } /* '' */ +.icon-flow-tree:before { content: '\e908'; } /* '' */ +.icon-flow-line:before { content: '\e909'; } /* '' */ +.icon-flow-branch:before { content: '\e90a'; } /* '' */ +.icon-flow-parallel-1:before { content: '\e90f'; } /* '' */ +.icon-dot:before { content: '\e910'; } /* '' */ +.icon-dot-3:before { content: '\e911'; } /* '' */ +.icon-cd:before { content: '\e912'; } /* '' */ +.icon-back-in-time:before { content: '\e913'; } /* '' */ +.icon-list:before { content: '\e914'; } /* '' */ +.icon-list-add:before { content: '\e915'; } /* '' */ +.icon-progress-0:before { content: '\e919'; } /* '' */ +.icon-pencil-2:before { content: '\e91d'; } /* '' */ +.icon-cog-2:before { content: '\e91f'; } /* '' */ +.icon-cog-circled:before { content: '\e920'; } /* '' */ +.icon-cogs:before { content: '\e921'; } /* '' */ +.icon-calendar-1:before { content: '\e924'; } /* '' */ +.icon-doc-new:before { content: '\e925'; } /* '' */ \ No newline at end of file diff --git a/ui/fontello/font/fontello.eot b/ui/fontello/font/fontello.eot new file mode 100644 index 0000000000000000000000000000000000000000..4485477e781e2444c35c47b5b8944695fcb79af3 GIT binary patch literal 42700 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 DzM+#I literal 0 HcmV?d00001 diff --git a/ui/fontello/font/fontello.svg b/ui/fontello/font/fontello.svg new file mode 100644 index 0000000..7efcd70 --- /dev/null +++ b/ui/fontello/font/fontello.svg @@ -0,0 +1,220 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata> +<defs> +<font id="fontello" horiz-adv-x="1000" > +<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" /> +<missing-glyph horiz-adv-x="1000" /> +<glyph glyph-name="user" unicode="" d="m786 66q0-67-41-106t-108-39h-488q-67 0-108 39t-41 106q0 30 2 58t8 61 15 60 24 55 34 45 48 30 62 11q5 0 24-12t41-27 60-27 75-12 74 12 61 27 41 27 24 12q34 0 62-11t48-30 34-45 24-55 15-60 8-61 2-58z m-179 498q0-88-63-151t-151-63-152 63-62 151 62 152 152 63 151-63 63-152z" horiz-adv-x="785.7" /> +<glyph glyph-name="help-circled" unicode="" d="m500 82v107q0 8-5 13t-13 5h-107q-8 0-13-5t-5-13v-107q0-8 5-13t13-5h107q8 0 13 5t5 13z m143 375q0 49-31 91t-77 65-95 23q-136 0-207-119-9-14 4-24l74-55q4-4 10-4 9 0 14 7 30 38 48 51 19 14 48 14 27 0 48-15t21-33q0-21-11-34t-38-25q-35-16-65-48t-29-70v-20q0-8 5-13t13-5h107q8 0 13 5t5 13q0 10 12 27t30 28q18 10 28 16t25 19 25 27 16 34 7 45z m214-107q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="search" unicode="" d="m643 386q0 103-74 176t-176 74-177-74-73-176 73-177 177-73 176 73 74 177z m286-465q0-29-22-50t-50-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" /> +<glyph glyph-name="tag" unicode="" d="m250 600q0 30-21 51t-50 20-51-20-21-51 21-50 51-21 50 21 21 50z m595-321q0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50z" horiz-adv-x="857.1" /> +<glyph glyph-name="dot-2" unicode="" d="m110 460q46 0 78-32t32-78q0-44-32-77t-78-33-78 32-32 78 32 78 78 32z m350 0q46 0 78-32t32-78q0-44-33-77t-77-33q-46 0-78 32t-32 78 32 78 78 32z" horiz-adv-x="570" /> +<glyph glyph-name="arrows-cw" unicode="" d="m843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-37 90-57t105-20q74 0 139 37t104 99q6 10 29 66 5 13 17 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" /> +<glyph glyph-name="print" unicode="" d="m214-7h500v143h-500v-143z m0 357h500v214h-89q-22 0-38 16t-16 38v89h-357v-357z m643-36q0 15-10 25t-26 11-25-11-10-25 10-25 25-10 26 10 10 25z m72 0v-232q0-7-6-12t-12-6h-125v-89q0-22-16-38t-38-16h-536q-22 0-37 16t-16 38v89h-125q-7 0-13 6t-5 12v232q0 44 32 76t75 31h36v304q0 22 16 38t37 16h375q23 0 50-12t42-26l85-85q15-16 27-43t11-49v-143h35q45 0 76-31t32-76z" horiz-adv-x="928.6" /> +<glyph glyph-name="cancel-circled" unicode="" d="m641 224q0 14-10 25l-101 101 101 101q10 11 10 25 0 15-10 26l-51 50q-10 11-25 11-15 0-25-11l-101-101-101 101q-11 11-26 11-15 0-25-11l-50-50q-11-11-11-26 0-14 11-25l101-101-101-101q-11-11-11-25 0-15 11-26l50-50q10-11 25-11 15 0 26 11l101 101 101-101q10-11 25-11 15 0 25 11l51 50q10 11 10 26z m216 126q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="edit-alt" unicode="" d="m0-150l0 1000 646 0-164-164-318 0 0-672 672 0 0 319 164 164 0-647-1000 0z m363 363l0 118 6 0q39 2 72-30 39-39 39-88l-117 0z m51 176l367 367 125-125-367-367z m397 397l64 64 125-125-64-64z" horiz-adv-x="1000" /> +<glyph glyph-name="login" unicode="" d="m661 350q0-14-11-25l-303-304q-11-10-26-10t-25 10-10 25v161h-250q-15 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 10 25t25 10 26-10l303-304q11-10 11-25z m196 196v-392q0-67-47-114t-114-47h-178q-7 0-13 5t-5 13q0 2-1 11t0 15 2 13 5 11 12 3h178q37 0 63 27t27 63v392q0 37-27 63t-63 27h-174t-6 0-6 2-5 3-4 5-1 8q0 2-1 11t0 15 2 13 5 11 12 3h178q67 0 114-47t47-114z" horiz-adv-x="857.1" /> +<glyph glyph-name="logout" unicode="" d="m357 46q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-27t-27-63v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8z m518 304q0-14-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25z" horiz-adv-x="928.6" /> +<glyph glyph-name="download" unicode="" d="m0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-144 60t-59 143z m155 359q0 33 24 57 23 23 56 23t57-23l105-106v344q0 33 24 57t56 23 57-23 24-57v-344l110 110q24 24 57 24t56-24q24-23 24-56t-24-57l-247-247q-24-25-57-25-32 0-56 25l-242 242q-24 24-24 57z" horiz-adv-x="937.5" /> +<glyph glyph-name="th-large" unicode="" d="m429 279v-215q0-29-22-50t-50-21h-286q-29 0-50 21t-21 50v215q0 29 21 50t50 21h286q29 0 50-21t22-50z m0 428v-214q0-29-22-50t-50-22h-286q-29 0-50 22t-21 50v214q0 29 21 50t50 22h286q29 0 50-22t22-50z m500-428v-215q0-29-22-50t-50-21h-286q-29 0-50 21t-21 50v215q0 29 21 50t50 21h286q29 0 50-21t22-50z m0 428v-214q0-29-22-50t-50-22h-286q-29 0-50 22t-21 50v214q0 29 21 50t50 22h286q29 0 50-22t22-50z" horiz-adv-x="928.6" /> +<glyph glyph-name="th" unicode="" d="m286 154v-108q0-22-16-37t-38-16h-178q-23 0-38 16t-16 37v108q0 22 16 38t38 15h178q22 0 38-15t16-38z m0 285v-107q0-22-16-38t-38-15h-178q-23 0-38 15t-16 38v107q0 23 16 38t38 16h178q22 0 38-16t16-38z m357-285v-108q0-22-16-37t-38-16h-178q-23 0-38 16t-16 37v108q0 22 16 38t38 15h178q23 0 38-15t16-38z m-357 571v-107q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v107q0 22 16 38t38 16h178q22 0 38-16t16-38z m357-286v-107q0-22-16-38t-38-15h-178q-23 0-38 15t-16 38v107q0 23 16 38t38 16h178q23 0 38-16t16-38z m357-285v-108q0-22-16-37t-38-16h-178q-22 0-38 16t-16 37v108q0 22 16 38t38 15h178q23 0 38-15t16-38z m-357 571v-107q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v107q0 22 16 38t38 16h178q23 0 38-16t16-38z m357-286v-107q0-22-16-38t-38-15h-178q-22 0-38 15t-16 38v107q0 23 16 38t38 16h178q23 0 38-16t16-38z m0 286v-107q0-22-16-38t-38-16h-178q-22 0-38 16t-16 38v107q0 22 16 38t38 16h178q23 0 38-16t16-38z" horiz-adv-x="1000" /> +<glyph glyph-name="th-list" unicode="" d="m286 154v-108q0-22-16-37t-38-16h-178q-23 0-38 16t-16 37v108q0 22 16 38t38 15h178q22 0 38-15t16-38z m0 285v-107q0-22-16-38t-38-15h-178q-23 0-38 15t-16 38v107q0 23 16 38t38 16h178q22 0 38-16t16-38z m714-285v-108q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v108q0 22 16 38t38 15h535q23 0 38-15t16-38z m-714 571v-107q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v107q0 22 16 38t38 16h178q22 0 38-16t16-38z m714-286v-107q0-22-16-38t-38-15h-535q-23 0-38 15t-16 38v107q0 23 16 38t38 16h535q23 0 38-16t16-38z m0 286v-107q0-22-16-38t-38-16h-535q-23 0-38 16t-16 38v107q0 22 16 38t38 16h535q23 0 38-16t16-38z" horiz-adv-x="1000" /> +<glyph glyph-name="star" unicode="" d="m929 489q0-12-15-27l-203-197 48-279q1-4 1-12 0-11-6-19t-17-9q-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27 0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26z" horiz-adv-x="928.6" /> +<glyph glyph-name="star-empty" unicode="" d="m634 290l171 165-235 35-106 213-105-213-236-35 171-165-41-235 211 111 211-111z m295 199q0-12-15-27l-203-197 48-279q1-4 1-12 0-28-23-28-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27 0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26z" horiz-adv-x="928.6" /> +<glyph glyph-name="users" unicode="" d="m331 350q-90-3-148-71h-75q-45 0-77 22t-31 66q0 197 69 197 4 0 25-11t54-24 66-12q38 0 75 13-3-21-3-37 0-78 45-143z m598-356q0-66-41-105t-108-39h-488q-68 0-108 39t-41 105q0 30 2 58t8 61 14 61 24 54 35 45 48 30 62 11q6 0 24-12t41-26 59-27 76-12 75 12 60 27 41 26 23 12q35 0 63-11t47-30 35-45 24-54 15-61 8-61 2-58z m-572 713q0-59-42-101t-101-42-101 42-42 101 42 101 101 42 101-42 42-101z m393-214q0-89-63-152t-151-62-152 62-63 152 63 151 152 63 151-63 63-151z m321-126q0-43-31-66t-77-22h-75q-57 68-147 71 45 65 45 143 0 16-3 37 37-13 74-13 33 0 67 12t54 24 24 11q69 0 69-197z m-71 340q0-59-42-101t-101-42-101 42-42 101 42 101 101 42 101-42 42-101z" horiz-adv-x="1071.4" /> +<glyph glyph-name="upload" unicode="" d="m0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-143 59t-60 144z m155 407q0 33 24 57l247 247q23 23 57 23 33 0 56-23l243-242q23-24 23-57t-23-57q-24-23-57-23t-57 23l-105 105v-344q0-33-24-57t-56-24q-33 0-57 24t-24 57v344l-110-110q-24-23-57-23t-56 23-24 57z" horiz-adv-x="937.5" /> +<glyph glyph-name="circle-thin" unicode="" d="m429 707q-73 0-139-28t-114-76-76-114-29-139 29-139 76-113 114-77 139-28 138 28 114 77 76 113 29 139-29 139-76 114-114 76-138 28z m428-357q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="dot-circled" unicode="" d="m571 350q0-59-41-101t-101-42-101 42-42 101 42 101 101 42 101-42 41-101z m-142 304q-83 0-153-41t-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152-41 152-110 111-152 41z m428-304q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="ok" unicode="" d="m932 534q0-22-15-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38t15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q15-16 15-38z" horiz-adv-x="1000" /> +<glyph glyph-name="check-empty-1" unicode="" d="m625 707h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v464q0 37-26 63t-63 26z m161-89v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q66 0 114-48t47-113z" horiz-adv-x="785.7" /> +<glyph glyph-name="clock-2" unicode="" d="m0 349q0 188 134 322t322 134 321-134 133-322-133-321-321-133-322 133-134 321z m119 0q0-140 99-238t238-99 238 99 99 238-99 238-238 99-238-99-99-238z m172-69l0 117 117 0 0 213 117 0 0-330-234 0z" horiz-adv-x="910" /> +<glyph glyph-name="ok-squared" unicode="" d="m382 125l343 343q10 10 10 25t-10 25l-57 57q-11 10-25 10t-25-10l-261-261-118 118q-10 11-25 11t-25-11l-57-57q-10-11-10-25t10-25l200-200q11-11 25-11t25 11z m475 493v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" /> +<glyph glyph-name="pin" unicode="" d="m268 368v250q0 8-5 13t-13 5-13-5-5-13v-250q0-8 5-13t13-5 13 5 5 13z m375-197q0-14-11-25t-25-10h-239l-29-270q-1-7-6-11t-11-5h-1q-15 0-17 15l-43 271h-225q-15 0-25 10t-11 25q0 69 44 124t99 55v286q-29 0-50 21t-22 50 22 50 50 22h357q29 0 50-22t21-50-21-50-50-21v-286q55 0 99-55t44-124z" horiz-adv-x="642.9" /> +<glyph glyph-name="eye" unicode="" d="m929 314q-85 132-213 197 34-58 34-125 0-104-73-177t-177-73-177 73-73 177q0 67 34 125-128-65-213-197 75-114 187-182t242-68 242 68 187 182z m-402 215q0 11-8 19t-19 7q-70 0-120-50t-50-119q0-12 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19z m473-215q0-19-11-38-78-129-210-206t-279-77-279 77-210 206q-11 19-11 38t11 39q78 128 210 205t279 78 279-78 210-205q11-20 11-39z" horiz-adv-x="1000" /> +<glyph glyph-name="attach" unicode="" d="m783 77q0-65-44-109t-109-44q-75 0-131 55l-434 434q-63 64-63 151 0 88 62 150t150 62q88 0 152-63l338-338q5-5 5-12 0-9-17-26t-26-17q-7 0-13 5l-338 339q-44 43-101 43-59 0-100-42t-40-101q0-58 42-101l433-433q35-35 81-35 36 0 59 23t24 59q0 46-36 81l-324 324q-14 14-33 14-16 0-27-11t-11-27q0-18 14-33l229-228q6-6 6-13 0-9-18-26t-26-17q-7 0-12 5l-229 229q-35 34-35 83 0 46 32 78t77 32q49 0 83-36l325-324q55-54 55-131z" horiz-adv-x="785.7" /> +<glyph glyph-name="unlink" unicode="" d="m245 141l-143-143q-5-5-13-5-6 0-13 5-5 5-5 13t5 13l143 142q6 5 13 5t13-5q5-5 5-12t-5-13z m94-23v-179q0-8-5-13t-13-5-12 5-5 13v179q0 8 5 13t12 5 13-5 5-13z m-125 125q0-8-5-13t-13-5h-178q-8 0-13 5t-5 13 5 13 13 5h178q8 0 13-5t5-13z m706-72q0-67-48-113l-82-81q-46-47-113-47-68 0-114 48l-186 187q-12 11-24 31l134 10 152-153q15-15 38-15t38 15l82 81q15 16 15 37 0 23-15 38l-153 154 10 133q20-12 31-23l188-188q47-48 47-114z m-345 404l-133-10-152 153q-16 16-38 16-22 0-38-15l-82-82q-16-15-16-37 0-22 16-38l153-153-10-134q-20 12-32 24l-187 187q-47 48-47 114 0 67 47 113l82 82q47 46 114 46 67 0 114-47l186-187q12-12 23-32z m354-46q0-8-5-13t-13-5h-179q-8 0-13 5t-5 13 5 12 13 5h179q8 0 13-5t5-12z m-304 303v-178q0-8-5-13t-13-5-13 5-5 13v178q0 8 5 13t13 5 13-5 5-13z m227-84l-143-143q-6-5-13-5t-12 5q-5 6-5 13t5 13l142 142q6 5 13 5t13-5q5-5 5-12t-5-13z" horiz-adv-x="928.6" /> +<glyph glyph-name="link" unicode="" d="m812 171q0 23-15 38l-116 116q-16 16-38 16-24 0-40-18 1-1 10-10t12-12 9-11 7-14 2-15q0-23-16-38t-38-16q-8 0-15 2t-14 7-11 9-12 12-10 10q-19-17-19-40 0-23 16-38l115-116q15-15 38-15 22 0 38 15l82 81q15 16 15 37z m-392 394q0 22-15 38l-115 115q-16 16-38 16-22 0-38-15l-82-82q-16-15-16-37 0-22 16-38l116-116q15-15 38-15 23 0 40 17-2 2-11 11t-12 12-8 10-7 14-2 16q0 22 15 38t38 15q9 0 16-2t14-7 10-8 12-12 11-11q18 17 18 41z m500-394q0-67-48-113l-82-81q-46-47-113-47-68 0-114 48l-115 115q-46 47-46 114 0 68 49 116l-49 49q-48-49-116-49-67 0-114 47l-116 116q-47 47-47 114t47 113l82 82q47 46 114 46 67 0 114-47l114-116q47-46 47-113 0-69-49-117l49-49q48 49 116 49 67 0 114-47l116-116q47-47 47-114z" horiz-adv-x="928.6" /> +<glyph glyph-name="home" unicode="" d="m786 296v-267q0-15-11-26t-25-10h-214v214h-143v-214h-214q-15 0-25 10t-11 26v267q0 1 0 2t0 2l321 264 321-264q1-1 1-4z m124 39l-34-41q-5-5-12-6h-2q-7 0-12 3l-386 322-386-322q-7-4-13-4-7 2-12 7l-35 41q-4 5-3 13t6 12l401 334q18 15 42 15t43-15l136-114v109q0 8 5 13t13 5h107q8 0 13-5t5-13v-227l122-102q5-5 6-12t-4-13z" horiz-adv-x="928.6" /> +<glyph glyph-name="info" unicode="" d="m357 100v-71q0-15-10-25t-26-11h-285q-15 0-25 11t-11 25v71q0 15 11 25t25 11h35v214h-35q-15 0-25 11t-11 25v71q0 15 11 25t25 11h214q15 0 25-11t11-25v-321h35q15 0 26-11t10-25z m-71 643v-107q0-15-11-25t-25-11h-143q-14 0-25 11t-11 25v107q0 14 11 25t25 11h143q15 0 25-11t11-25z" horiz-adv-x="357.1" /> +<glyph glyph-name="info-circled" unicode="" d="m571 82v89q0 8-5 13t-12 5h-54v286q0 8-5 13t-13 5h-178q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h53v-179h-53q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h250q7 0 12 5t5 13z m-71 500v89q0 8-5 13t-13 5h-107q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h107q8 0 13 5t5 13z m357-232q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="export" unicode="" d="m786 298v-144q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h142q7 0 13-6t5-12q0-15-15-18-43-15-74-34-5-2-9-2h-62q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v119q0 11 10 16 16 7 30 21 9 9 20 4 12-5 12-16z m132 277l-214-214q-10-11-25-11-7 0-14 3-22 9-22 33v107h-89q-181 0-245-73-66-77-41-264 2-13-11-19-5-1-7-1-9 0-14 7-6 8-12 17t-22 38-28 56-21 64-10 68q0 27 2 50t8 51 15 49 27 45 38 42 52 34 70 27 89 17 110 6h89v107q0 24 22 33 7 3 14 3 14 0 25-11l214-214q11-11 11-25t-11-25z" horiz-adv-x="928.6" /> +<glyph glyph-name="export-alt" unicode="" d="m561 236l196 196q11 11 11 25t-11 25l-196 197q-17 17-39 7-22-9-22-32v-90q-66 0-121-11t-90-28-64-44-42-53-25-61-12-62-3-62q0-101 93-226 6-6 14-6 4 0 7 1 13 5 11 19-25 197 34 264 26 29 73 42t125 13v-89q0-24 22-33 7-3 14-3 14 0 25 11z m296 382v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" /> +<glyph glyph-name="share" unicode="" d="m679 279q74 0 126-53t52-126-52-126-126-53-127 53-52 126q0 7 1 19l-201 100q-51-48-121-48-75 0-127 53t-52 126 52 126 127 53q70 0 121-48l201 100q-1 12-1 19 0 74 52 126t127 53 126-53 52-126-52-126-126-53q-71 0-122 48l-201-100q1-12 1-19t-1-19l201-100q51 48 122 48z" horiz-adv-x="857.1" /> +<glyph glyph-name="share-squared" unicode="" d="m714 183q0 49-35 84t-84 36q-46 0-80-33l-135 67q1 9 1 13t-1 13l135 67q34-33 80-33 50 0 84 36t35 84-35 84-84 35-84-35-35-84q0-4 1-13l-134-67q-35 32-81 32-49 0-84-35t-35-84 35-84 84-35q46 0 81 32l134-67q-1-9-1-13 0-49 35-84t84-35 84 35 35 84z m143 435v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" /> +<glyph glyph-name="retweet" unicode="" d="m714 11q0-8-5-13t-13-5h-535q-5 0-8 1t-5 4-3 4-2 7 0 6v335h-107q-15 0-25 11t-11 25q0 13 8 23l179 214q11 12 27 12t28-12l178-214q9-10 9-23 0-15-11-25t-25-11h-107v-214h321q9 0 14-6l89-108q4-6 4-11z m357 232q0-14-8-23l-179-214q-11-13-27-13t-27 13l-179 214q-8 9-8 23 0 14 10 25t26 11h107v214h-322q-9 0-14 7l-89 107q-4 5-4 11 0 7 5 12t13 6h536q4 0 7-1t5-4 3-5 2-6 1-7v-334h107q14 0 25-11t10-25z" horiz-adv-x="1071.4" /> +<glyph glyph-name="attention-alt" unicode="" d="m286 154v-125q0-15-11-25t-25-11h-143q-14 0-25 11t-11 25v125q0 14 11 25t25 10h143q15 0 25-10t11-25z m16 589l-15-429q-1-14-12-25t-25-10h-143q-14 0-25 10t-12 25l-15 429q-1 14 9 25t25 11h179q14 0 25-11t9-25z" horiz-adv-x="357.1" /> +<glyph glyph-name="attention" unicode="" d="m571 83v106q0 8-5 13t-12 5h-108q-7 0-12-5t-5-13v-106q0-8 5-13t12-6h108q7 0 12 6t5 13z m-1 208l10 257q0 6-5 10-7 6-14 6h-122q-7 0-14-6-5-4-5-12l9-255q0-5 6-9t13-3h103q8 0 13 3t6 9z m-7 522l428-786q20-35-1-70-10-17-26-26t-35-10h-858q-18 0-35 10t-26 26q-21 35-1 70l429 786q9 17 26 27t36 10 36-10 27-27z" horiz-adv-x="1000" /> +<glyph glyph-name="attention-circled" unicode="" d="m429 779q116 0 215-58t156-156 57-215-57-215-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58z m71-696v106q0 8-5 13t-12 5h-107q-8 0-13-5t-6-13v-106q0-8 6-13t13-6h107q7 0 12 6t5 13z m-1 192l10 346q0 7-6 10-5 5-13 5h-123q-8 0-13-5-6-3-6-10l10-346q0-6 5-10t14-4h103q8 0 13 4t6 10z" horiz-adv-x="857.1" /> +<glyph glyph-name="location" unicode="" d="m429 493q0 59-42 101t-101 42-101-42-42-101 42-101 101-42 101 42 42 101z m142 0q0-61-18-100l-203-432q-9-18-27-29t-37-11-38 11-26 29l-204 432q-18 39-18 100 0 118 84 202t202 84 202-84 83-202z" horiz-adv-x="571.4" /> +<glyph glyph-name="trash" unicode="" d="m286 439v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m143 0v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m142 0v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q7 0 12-5t5-13z m72-404v529h-500v-529q0-12 4-22t8-15 6-5h464q2 0 6 5t8 15 4 22z m-375 601h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q22 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" /> +<glyph glyph-name="doc" unicode="" d="m819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 16-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 15t-16 38v233h-429v-858h715z" horiz-adv-x="857.1" /> +<glyph glyph-name="docs" unicode="" d="m946 636q23 0 38-16t16-38v-678q0-23-16-38t-38-16h-535q-23 0-38 16t-16 38v160h-303q-23 0-38 16t-16 38v375q0 22 11 49t27 42l228 228q15 16 42 27t49 11h232q23 0 38-16t16-38v-183q38 23 71 23h232z m-303-119l-167-167h167v167z m-357 214l-167-167h167v167z m109-361l176 176v233h-214v-233q0-22-15-38t-38-15h-233v-357h286v143q0 22 11 49t27 42z m534-449v643h-215v-232q0-22-15-38t-38-15h-232v-358h500z" horiz-adv-x="1000" /> +<glyph glyph-name="doc-text" unicode="" d="m819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 16-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 15t-16 38v233h-429v-858h715z m-572 483q0 7 5 12t13 5h393q8 0 13-5t5-12v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36z m411-125q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36q0 8 5 13t13 5h393z m0-143q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36q0 8 5 13t13 5h393z" horiz-adv-x="857.1" /> +<glyph glyph-name="doc-inv" unicode="" d="m571 564v264q13-8 21-16l227-228q8-7 16-20h-264z m-71-18q0-22 16-38t38-15h303v-589q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h446v-304z" horiz-adv-x="857.1" /> +<glyph glyph-name="doc-text-inv" unicode="" d="m819 584q8-7 16-20h-264v264q13-8 21-16z m-265-91h303v-589q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h446v-304q0-22 16-38t38-15z m89-411v36q0 8-5 13t-13 5h-393q-8 0-13-5t-5-13v-36q0-8 5-13t13-5h393q8 0 13 5t5 13z m0 143v36q0 7-5 12t-13 5h-393q-8 0-13-5t-5-12v-36q0-8 5-13t13-5h393q8 0 13 5t5 13z m0 143v35q0 8-5 13t-13 5h-393q-8 0-13-5t-5-13v-35q0-8 5-13t13-5h393q8 0 13 5t5 13z" horiz-adv-x="857.1" /> +<glyph glyph-name="file-pdf" unicode="" d="m819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 16-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 15t-16 38v233h-429v-858h715z m-287 331q18-14 47-31 33 4 65 4 82 0 99-27 9-13 1-29 0-1-1-1l-1-2v0q-3-21-39-21-27 0-65 11t-72 29q-123-13-219-46-85-146-135-146-8 0-15 4l-14 6q0 1-3 3-6 6-4 20 5 23 32 51t73 54q8 5 13-3 1-1 1-2 29 47 60 110 38 76 58 146-13 46-17 89t4 71q6 22 23 22h12q13 0 20-8 10-12 5-38-1-3-2-4 0-2 0-5v-17q-1-68-8-107 31-91 82-133z m-322-229q30 13 77 88-29-22-49-47t-28-41z m223 513q-9-23-2-73 1 4 4 24 0 2 4 24 1 3 3 5-1 0-1 1t0 1-1 1q0 12-7 20 0-1 0-1v-2z m-70-368q76 30 159 45-1 0-7 5t-9 8q-43 37-71 98-15-48-47-110-16-31-25-46z m361 8q-14 14-78 14 42-16 69-16 8 0 10 1 0 0-1 1z" horiz-adv-x="857.1" /> +<glyph glyph-name="file-word" unicode="" d="m819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 16-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 15t-16 38v233h-429v-858h715z m-656 500v-59h39l92-369h88l72 271q4 11 5 25 1 9 1 14h3l1-14q1-1 2-11t3-14l72-271h89l91 369h39v59h-167v-59h50l-55-245q-3-11-4-25l-1-12h-3l-1 12q-1 2-2 11t-3 14l-81 304h-63l-81-304q-1-5-2-13t-2-12l-2-12h-2l-2 12q-1 14-4 25l-55 245h50v59h-167z" horiz-adv-x="857.1" /> +<glyph glyph-name="file-excel" unicode="" d="m819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 16-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 15t-16 38v233h-429v-858h715z m-547 131v-59h157v59h-42l58 90q3 4 5 9t5 8 2 2h1q0-2 2-6 2-2 3-4t3-4 4-5l60-90h-43v-59h163v59h-38l-107 152 108 158h38v59h-156v-59h41l-57-89q-2-4-6-9t-5-8l-1-1h-1q-1 2-3 5-3 6-9 13l-59 89h42v59h-162v-59h38l106-152-109-158h-38z" horiz-adv-x="857.1" /> +<glyph glyph-name="file-powerpoint" unicode="" d="m819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 16-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 15t-16 38v233h-429v-858h715z m-554 131v-59h183v59h-52v93h76q43 0 66 9 37 12 59 48t23 82q0 45-21 78t-56 49q-27 10-72 10h-206v-59h52v-310h-52z m197 156h-66v150h67q29 0 46-10 31-19 31-64 0-50-34-67-18-9-44-9z" horiz-adv-x="857.1" /> +<glyph glyph-name="file-image" unicode="" d="m819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 16-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 15t-16 38v233h-429v-858h715z m-72 250v-178h-571v107l107 107 71-71 215 214z m-464 108q-45 0-76 31t-31 76 31 76 76 31 76-31 31-76-31-76-76-31z" horiz-adv-x="857.1" /> +<glyph glyph-name="cog" unicode="" d="m571 350q0 59-41 101t-101 42-101-42-42-101 42-101 101-42 101 42 41 101z m286 61v-124q0-7-4-13t-11-7l-104-16q-10-30-21-51 19-27 59-77 6-6 6-13t-5-13q-15-21-55-61t-53-39q-7 0-14 5l-77 60q-25-13-51-21-9-76-16-104-4-16-20-16h-124q-8 0-14 5t-6 12l-16 103q-27 9-50 21l-79-60q-6-5-14-5-8 0-14 6-70 64-92 94-4 5-4 13 0 6 5 12 8 12 28 37t30 40q-15 28-23 55l-102 15q-7 1-11 7t-5 13v124q0 7 5 13t10 7l104 16q8 25 22 51-23 32-60 77-6 7-6 14 0 5 5 12 15 20 55 60t53 40q7 0 15-5l77-60q24 13 50 21 9 76 17 104 3 15 20 15h124q7 0 13-4t7-12l15-103q28-9 50-21l80 60q5 5 13 5 7 0 14-5 72-67 92-95 4-5 4-13 0-6-4-12-9-12-29-38t-30-39q14-28 23-55l102-15q7-1 12-7t4-13z" horiz-adv-x="857.1" /> +<glyph glyph-name="cog-alt" unicode="" d="m500 350q0 59-42 101t-101 42-101-42-42-101 42-101 101-42 101 42 42 101z m429-286q0 29-22 51t-50 21-50-21-21-51q0-29 21-50t50-21 51 21 21 50z m0 572q0 29-22 50t-50 21-50-21-21-50q0-30 21-51t50-21 51 21 21 51z m-215-235v-103q0-6-4-11t-9-6l-86-14q-6-19-18-42 19-27 50-64 4-6 4-11 0-7-4-11-13-17-46-50t-44-33q-6 0-11 4l-64 50q-21-11-43-17-6-60-13-87-4-13-17-13h-104q-6 0-11 4t-5 10l-13 85q-19 6-42 18l-66-50q-4-4-11-4-6 0-12 4-80 75-80 90 0 5 4 10 5 8 23 30t26 34q-13 24-20 46l-85 13q-5 1-9 5t-4 11v103q0 6 4 11t9 6l86 14q7 19 18 42-19 27-50 64-4 6-4 11 0 7 4 11 12 17 46 50t44 33q6 0 12-4l64-50q19 10 43 18 6 60 13 86 3 13 16 13h104q6 0 11-4t6-10l13-85q19-6 41-17l66 49q5 4 11 4 7 0 12-4 81-75 81-90 0-5-4-10-7-9-24-30t-25-34q13-27 19-46l85-12q5-2 9-6t4-11z m357-298v-78q0-9-83-17-6-15-16-29 28-63 28-77 0-2-2-4-68-40-69-40-5 0-26 27t-29 37q-11-1-17-1t-17 1q-7-11-29-37t-25-27q-1 0-69 40-3 2-3 4 0 14 29 77-10 14-17 29-83 8-83 17v78q0 9 83 1! 8 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 1 17 1t17-1q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-9 83-18z m0 572v-78q0-9-83-18-6-15-16-29 28-63 28-77 0-2-2-4-68-39-69-39-5 0-26 26t-29 38q-11-1-17-1t-17 1q-7-12-29-38t-25-26q-1 0-69 39-3 2-3 4 0 14 29 77-10 14-17 29-83 9-83 18v78q0 9 83 17 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 2 17 2t17-2q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-8 83-17z" horiz-adv-x="1071.4" /> +<glyph glyph-name="wrench" unicode="" d="m214 29q0 14-10 25t-25 10-26-10-10-25 10-26 26-10 25 10 10 26z m360 234l-381-381q-21-20-50-20-29 0-51 20l-59 61q-21 20-21 50 0 29 21 51l380 380q22-55 64-97t97-64z m353 243q0-22-12-59-27-75-92-122t-144-46q-104 0-177 73t-73 177 73 176 177 74q32 0 67-10t60-26q9-6 9-15t-9-16l-163-94v-125l108-60q2 2 44 27t75 45 40 20q8 0 13-5t4-14z" horiz-adv-x="928.6" /> +<glyph glyph-name="calendar" unicode="" d="m71-79h161v161h-161v-161z m197 0h178v161h-178v-161z m-197 197h161v178h-161v-178z m197 0h178v178h-178v-178z m-197 214h161v161h-161v-161z m411-411h179v161h-179v-161z m-214 411h178v161h-178v-161z m428-411h161v161h-161v-161z m-214 197h179v178h-179v-178z m-196 482v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161q0-7 6-13t12-5h36q7 0 12 5t6 13z m410-482h161v178h-161v-178z m-214 214h179v161h-179v-161z m214 0h161v161h-161v-161z m18 268v161q0 7-5 12t-13 6h-35q-8 0-13-6t-5-12v-161q0-7 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 36 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 36 27 63t63 26h35q37 0 63-26t27-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" /> +<glyph glyph-name="calendar-empty" unicode="" d="m71-79h786v572h-786v-572z m215 679v161q0 8-5 13t-13 5h-36q-8 0-13-5t-5-13v-161q0-8 5-13t13-5h36q8 0 13 5t5 13z m428 0v161q0 8-5 13t-13 5h-35q-8 0-13-5t-5-13v-161q0-8 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 36 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 36 27 63t63 26h35q37 0 63-26t27-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" /> +<glyph glyph-name="clock" unicode="" d="m500 546v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13z m232-196q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="block" unicode="" d="m732 352q0 90-48 164l-421-420q76-50 166-50 62 0 118 25t96 65 65 97 24 119z m-557-167l421 421q-75 50-167 50-83 0-153-40t-110-112-41-152q0-91 50-167z m682 167q0-88-34-168t-91-137-137-92-166-34-167 34-137 92-91 137-34 168 34 167 91 137 137 91 167 34 166-34 137-91 91-137 34-167z" horiz-adv-x="857.1" /> +<glyph glyph-name="zoom-in" unicode="" d="m571 404v-36q0-7-5-13t-12-5h-125v-125q0-7-6-13t-12-5h-36q-7 0-13 5t-5 13v125h-125q-7 0-12 5t-6 13v36q0 7 6 12t12 5h125v125q0 8 5 13t13 5h36q7 0 12-5t6-13v-125h125q7 0 12-5t5-12z m72-18q0 103-74 176t-176 74-177-74-73-176 73-177 177-73 176 73 74 177z m286-465q0-29-21-50t-51-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" /> +<glyph glyph-name="zoom-out" unicode="" d="m571 404v-36q0-7-5-13t-12-5h-322q-7 0-12 5t-6 13v36q0 7 6 12t12 5h322q7 0 12-5t5-12z m72-18q0 103-74 176t-176 74-177-74-73-176 73-177 177-73 176 73 74 177z m286-465q0-29-21-50t-51-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" /> +<glyph glyph-name="down-circled2" unicode="" d="m625 332q0-7-6-13l-178-178q-6-5-12-5t-13 5l-179 178q-8 9-4 20 5 11 17 11h107v196q0 8 5 13t13 5h107q8 0 13-5t5-13v-196h107q8 0 13-5t5-13z m-196 322q-83 0-153-41t-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152-41 152-110 111-152 41z m428-304q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="up-circled2" unicode="" d="m624 361q-5-11-17-11h-107v-196q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13v196h-107q-8 0-13 5t-5 13q0 7 6 13l178 178q6 5 13 5t12-5l179-178q8-9 4-20z m-195 293q-83 0-153-41t-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152-41 152-110 111-152 41z m428-304q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="left-circled2" unicode="" d="m643 404v-108q0-7-5-12t-13-5h-196v-108q0-7-5-12t-13-5q-7 0-14 5l-178 178q-5 5-5 13t5 13l179 178q5 5 13 5 7 0 12-5t6-12v-108h196q7 0 13-5t5-12z m89-54q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="right-circled2" unicode="" d="m643 350q0-8-5-13l-179-178q-5-5-13-5-7 0-12 5t-5 12v108h-197q-7 0-12 5t-6 12v108q0 7 6 12t12 5h197v108q0 7 5 12t12 5q7 0 14-5l178-178q5-5 5-13z m89 0q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="down-dir" unicode="" d="m571 457q0-14-10-25l-250-250q-11-11-25-11t-25 11l-250 250q-11 11-11 25t11 25 25 11h500q14 0 25-11t10-25z" horiz-adv-x="571.4" /> +<glyph glyph-name="up-dir" unicode="" d="m571 171q0-14-10-25t-25-10h-500q-15 0-25 10t-11 25 11 26l250 250q10 10 25 10t25-10l250-250q10-11 10-26z" horiz-adv-x="571.4" /> +<glyph glyph-name="left-dir" unicode="" d="m357 600v-500q0-14-10-25t-26-11-25 11l-250 250q-10 11-10 25t10 25l250 250q11 11 25 11t26-11 10-25z" horiz-adv-x="357.1" /> +<glyph glyph-name="right-dir" unicode="" d="m321 350q0-14-10-25l-250-250q-11-11-25-11t-25 11-11 25v500q0 15 11 25t25 11 25-11l250-250q10-10 10-25z" horiz-adv-x="357.1" /> +<glyph glyph-name="down-open" unicode="" d="m939 399l-414-413q-10-11-25-11t-25 11l-414 413q-11 11-11 26t11 25l92 92q11 11 26 11t25-11l296-296 296 296q11 11 25 11t26-11l92-92q11-11 11-25t-11-26z" horiz-adv-x="1000" /> +<glyph glyph-name="left-open" unicode="" d="m653 682l-296-296 296-297q11-10 11-25t-11-25l-92-93q-11-10-25-10t-25 10l-414 415q-11 10-11 25t11 25l414 414q10 10 25 10t25-10l92-93q11-10 11-25t-11-25z" horiz-adv-x="714.3" /> +<glyph glyph-name="right-open" unicode="" d="m618 361l-414-415q-11-10-25-10t-26 10l-92 93q-11 11-11 25t11 25l296 297-296 296q-11 11-11 25t11 25l92 93q11 10 26 10t25-10l414-414q10-11 10-25t-10-25z" horiz-adv-x="714.3" /> +<glyph glyph-name="up-open" unicode="" d="m939 107l-92-92q-11-10-26-10t-25 10l-296 297-296-297q-11-10-25-10t-26 10l-92 92q-11 11-11 26t11 25l414 414q11 10 25 10t25-10l414-414q11-11 11-25t-11-26z" horiz-adv-x="1000" /> +<glyph glyph-name="angle-left" unicode="" d="m350 546q0-7-6-12l-219-220 219-219q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-260 260q-6 6-6 13t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13z" horiz-adv-x="357.1" /> +<glyph glyph-name="angle-right" unicode="" d="m332 314q0-7-6-13l-260-260q-5-5-12-5t-13 5l-28 28q-6 6-6 13t6 13l219 219-219 220q-6 5-6 12t6 13l28 28q5 6 13 6t12-6l260-260q6-5 6-13z" horiz-adv-x="357.1" /> +<glyph glyph-name="angle-up" unicode="" d="m600 189q0-7-6-13l-28-27q-5-6-12-6t-13 6l-220 219-219-219q-5-6-13-6t-13 6l-27 27q-6 6-6 13t6 13l260 260q5 6 12 6t13-6l260-260q6-5 6-13z" horiz-adv-x="642.9" /> +<glyph glyph-name="angle-down" unicode="" d="m600 439q0-7-6-13l-260-260q-5-5-13-5t-12 5l-260 260q-6 6-6 13t6 13l27 28q6 6 13 6t13-6l219-219 220 219q5 6 13 6t12-6l28-28q6-5 6-13z" horiz-adv-x="642.9" /> +<glyph glyph-name="angle-circled-left" unicode="" d="m507 72l57 56q11 11 11 26t-11 25l-171 171 171 171q11 11 11 25t-11 25l-57 57q-10 11-25 11t-25-11l-253-253q-11-11-11-25t11-25l253-254q11-10 25-10t25 10z m350 278q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="angle-circled-right" unicode="" d="m400 72l253 253q11 11 11 25t-11 25l-253 253q-10 11-25 11t-25-11l-57-56q-11-11-11-26t11-25l171-171-171-171q-11-11-11-25t11-26l57-57q11-10 25-10t25 10z m457 278q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="angle-circled-up" unicode="" d="m650 214l57 57q11 11 11 25t-11 26l-253 253q-11 10-25 10t-26-10l-253-254q-10-10-10-25t10-25l57-57q11-10 25-10t25 10l172 172 171-172q11-10 25-10t25 10z m207 136q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="angle-circled-down" unicode="" d="m454 125l253 253q11 11 11 26t-11 25l-57 57q-10 10-25 10t-25-10l-171-172-172 172q-10 10-25 10t-25-10l-57-57q-10-11-10-25t10-26l253-253q11-10 26-10t25 10z m403 225q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="angle-double-left" unicode="" d="m350 82q0-7-6-13l-28-28q-5-5-12-5t-13 5l-260 260q-6 6-6 13t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13t-6-12l-219-220 219-219q6-6 6-13z m214 0q0-7-5-13l-28-28q-6-5-13-5t-13 5l-260 260q-6 6-6 13t6 13l260 260q6 6 13 6t13-6l28-28q5-5 5-13t-5-12l-220-220 220-219q5-6 5-13z" horiz-adv-x="571.4" /> +<glyph glyph-name="angle-double-right" unicode="" d="m332 314q0-7-6-13l-260-260q-5-5-12-5t-13 5l-28 28q-6 6-6 13t6 13l219 219-219 220q-6 5-6 12t6 13l28 28q5 6 13 6t12-6l260-260q6-5 6-13z m214 0q0-7-5-13l-260-260q-6-5-13-5t-13 5l-28 28q-5 6-5 13t5 13l219 219-219 220q-5 5-5 12t5 13l28 28q6 6 13 6t13-6l260-260q5-5 5-13z" horiz-adv-x="571.4" /> +<glyph glyph-name="angle-double-up" unicode="" d="m600 118q0-7-6-13l-28-28q-5-5-12-5t-13 5l-220 219-219-219q-5-5-13-5t-13 5l-27 28q-6 6-6 13t6 13l260 260q5 5 12 5t13-5l260-260q6-6 6-13z m0 214q0-7-6-13l-28-28q-5-5-12-5t-13 5l-220 220-219-220q-5-5-13-5t-13 5l-27 28q-6 6-6 13t6 13l260 260q5 6 12 6t13-6l260-260q6-6 6-13z" horiz-adv-x="642.9" /> +<glyph glyph-name="angle-double-down" unicode="" d="m600 368q0-7-6-13l-260-260q-5-6-13-6t-12 6l-260 260q-6 6-6 13t6 13l27 28q6 5 13 5t13-5l219-220 220 220q5 5 13 5t12-5l28-28q6-6 6-13z m0 214q0-7-6-13l-260-260q-5-5-13-5t-12 5l-260 260q-6 6-6 13t6 13l27 28q6 5 13 5t13-5l219-220 220 220q5 5 13 5t12-5l28-28q6-6 6-13z" horiz-adv-x="642.9" /> +<glyph glyph-name="down-big" unicode="" d="m899 386q0-30-21-50l-363-364q-22-21-51-21-29 0-50 21l-363 364q-21 20-21 50 0 29 21 51l41 41q22 21 51 21 29 0 50-21l164-164v393q0 29 21 50t51 22h71q29 0 50-22t21-50v-393l164 164q21 21 51 21 29 0 50-21l42-42q21-21 21-50z" horiz-adv-x="928.6" /> +<glyph glyph-name="left-big" unicode="" d="m857 350v-71q0-30-18-51t-47-21h-393l164-164q21-20 21-50t-21-50l-42-43q-21-20-51-20-29 0-50 20l-364 364q-20 21-20 50 0 29 20 51l364 363q21 21 50 21 29 0 51-21l42-42q21-21 21-50t-21-51l-164-164h393q29 0 47-20t18-51z" horiz-adv-x="857.1" /> +<glyph glyph-name="right-big" unicode="" d="m821 314q0-30-20-50l-363-364q-22-20-51-20-29 0-50 20l-42 42q-22 21-22 51t22 51l163 163h-393q-29 0-47 21t-18 51v71q0 30 18 51t47 20h393l-163 164q-22 21-22 51t22 50l42 42q21 21 50 21 29 0 51-21l363-363q20-20 20-51z" horiz-adv-x="857.1" /> +<glyph glyph-name="up-big" unicode="" d="m899 308q0-28-21-50l-42-42q-21-21-50-21-30 0-51 21l-164 164v-393q0-29-20-47t-51-19h-71q-30 0-51 19t-21 47v393l-164-164q-20-21-50-21t-50 21l-42 42q-21 21-21 50 0 30 21 51l363 363q20 21 50 21 30 0 51-21l363-363q21-22 21-51z" horiz-adv-x="928.6" /> +<glyph glyph-name="left-circled" unicode="" d="m714 314v72q0 14-10 25t-25 10h-281l106 106q11 11 11 25t-11 25l-51 51q-10 10-25 10t-25-10l-202-202-51-51q-10-10-10-25t10-25l51-51 202-202q10-10 25-10t25 10l51 51q10 10 10 25t-10 25l-106 106h281q14 0 25 10t10 25z m143 36q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="right-circled" unicode="" d="m717 350q0 15-10 25l-51 51-202 202q-10 10-25 10t-25-10l-51-51q-10-10-10-25t10-25l106-106h-280q-15 0-26-10t-10-25v-72q0-14 10-25t26-10h280l-106-106q-10-10-10-25t10-25l51-51q10-10 25-10t25 10l202 202 51 51q10 10 10 25z m140 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="up-circled" unicode="" d="m717 351q0 15-11 25l-202 202-50 50q-10 11-25 11t-26-11l-50-50-202-202q-10-10-10-25t10-26l50-50q11-10 26-10t25 10l105 105v-280q0-14 11-25t25-11h71q15 0 25 11t11 25v280l105-105q11-11 26-11t25 11l50 50q11 11 11 26z m140-1q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="down-circled" unicode="" d="m717 349q0 16-11 26l-50 50q-10 10-25 10t-26-10l-105-105v280q0 15-11 25t-25 11h-71q-15 0-25-11t-11-25v-280l-105 105q-11 11-25 11t-26-11l-50-50q-10-10-10-26t10-25l202-202 50-50q11-10 26-10t25 10l50 50 202 202q11 10 11 25z m140 1q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="cw" unicode="" d="m857 707v-250q0-14-10-25t-26-11h-250q-23 0-32 23-10 22 7 38l77 77q-82 77-194 77-58 0-111-23t-91-61-62-91-22-111 22-111 62-91 91-61 111-23q66 0 125 29t100 82q4 6 13 7 8 0 14-5l76-77q5-4 6-11t-5-13q-60-74-147-114t-182-41q-87 0-167 34t-136 92-92 137-34 166 34 166 92 137 136 92 167 34q82 0 158-31t137-88l72 72q16 18 39 8 22-9 22-33z" horiz-adv-x="857.1" /> +<glyph glyph-name="ccw" unicode="" d="m857 350q0-87-34-166t-91-137-137-92-166-34q-96 0-183 41t-147 114q-4 6-4 13t5 11l76 77q6 5 14 5 9-1 13-7 41-53 100-82t126-29q58 0 110 23t92 61 61 91 22 111-22 111-61 91-92 61-110 23q-55 0-105-20t-90-57l77-77q17-16 8-38-10-23-33-23h-250q-15 0-25 11t-11 25v250q0 24 22 33 22 10 39-8l72-72q60 57 137 88t159 31q87 0 166-34t137-92 91-137 34-166z" horiz-adv-x="857.1" /> +<glyph glyph-name="level-up" unicode="" d="m568 514q-10-21-32-21h-107v-482q0-8-5-13t-13-5h-393q-12 0-16 10-5 11 2 19l89 108q5 6 14 6h179v357h-107q-23 0-33 21-9 20 5 37l179 215q10 12 27 12t28-12l178-215q15-17 5-37z" horiz-adv-x="571.4" /> +<glyph glyph-name="level-down" unicode="" d="m18 707h393q7 0 12-5t6-13v-482h107q22 0 32-20t-5-39l-178-214q-11-13-28-13t-27 13l-179 214q-14 17-5 39 10 20 33 20h107v357h-179q-8 0-14 6l-89 108q-7 7-2 19 5 10 16 10z" horiz-adv-x="571.4" /> +<glyph glyph-name="shuffle" unicode="" d="m372 582q-34-52-77-153-12 25-20 41t-23 35-28 32-36 19-45 8h-125q-8 0-13 5t-5 13v107q0 8 5 13t13 5h125q139 0 229-125z m628-446q0-8-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107q-18 0-48 0t-45-1-41 1-39 3-36 6-35 10-32 16-33 22-31 30-31 39q33 52 76 152 12-25 20-40t23-36 28-31 35-20 46-8h143v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13z m0 500q0-8-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107h-143q-27 0-49-8t-38-25-29-35-25-43q-18-34-43-95-16-37-28-62t-30-59-36-55-41-47-50-38-60-23-71-10h-125q-8 0-13 5t-5 13v107q0 8 5 13t13 5h125q27 0 48 9t39 25 28 34 26 43q17 35 43 96 16 36 28 62t30 58 36 56 41 46 50 38 59 24 72 9h143v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13z" horiz-adv-x="1000" /> +<glyph glyph-name="exchange" unicode="" d="m1000 189v-107q0-7-5-12t-13-6h-768v-107q0-7-5-12t-13-6q-6 0-13 6l-178 178q-5 5-5 13 0 8 5 13l179 178q5 5 12 5 8 0 13-5t5-13v-107h768q7 0 13-5t5-13z m0 304q0-8-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107h-768q-7 0-13 6t-5 12v107q0 8 5 13t13 5h768v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13z" horiz-adv-x="1000" /> +<glyph glyph-name="history" unicode="" d="m857 350q0-87-34-166t-91-137-137-92-166-34q-96 0-183 41t-147 114q-4 6-4 13t5 11l76 77q6 5 14 5 9-1 13-7 41-53 100-82t126-29q58 0 110 23t92 61 61 91 22 111-22 111-61 91-92 61-110 23q-55 0-105-20t-90-57l77-77q17-16 8-38-10-23-33-23h-250q-15 0-25 11t-11 25v250q0 24 22 33 22 10 39-8l72-72q60 57 137 88t159 31q87 0 166-34t137-92 91-137 34-166z m-357 161v-250q0-8-5-13t-13-5h-178q-8 0-13 5t-5 13v35q0 8 5 13t13 5h125v197q0 8 5 13t12 5h36q8 0 13-5t5-13z" horiz-adv-x="857.1" /> +<glyph glyph-name="expand" unicode="" d="m639 473q10-19-3-36l-178-250q-11-16-29-16t-29 16l-179 250q-13 17-3 36 10 20 32 20h357q22 0 32-20z m75-391v536q0 7-5 12t-13 6h-535q-7 0-13-6t-5-12v-536q0-7 5-12t13-6h535q8 0 13 6t5 12z m143 536v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" /> +<glyph glyph-name="collapse" unicode="" d="m639 227q-10-20-32-20h-357q-22 0-32 20-10 19 3 37l179 250q10 15 29 15t29-15l178-250q13-18 3-37z m75-145v536q0 7-5 12t-13 6h-535q-7 0-13-6t-5-12v-536q0-7 5-12t13-6h535q8 0 13 6t5 12z m143 536v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" /> +<glyph glyph-name="expand-right" unicode="" d="m607 350q0-18-15-29l-250-179q-17-12-37-2-19 9-19 31v358q0 22 19 31 20 10 37-2l250-179q15-11 15-29z m107-268v536q0 8-5 13t-13 5h-535q-8 0-13-5t-5-13v-536q0-8 5-13t13-5h535q8 0 13 5t5 13z m143 536v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" /> +<glyph glyph-name="collapse-left" unicode="" d="m571 529v-358q0-14-10-25t-25-10q-11 0-21 6l-250 179q-15 11-15 29t15 29l250 179q10 6 21 6 14 0 25-10t10-25z m143-447v536q0 7-5 12t-13 6h-535q-7 0-13-6t-5-12v-536q0-7 5-12t13-6h535q8 0 13 6t5 12z m143 536v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" /> +<glyph glyph-name="play" unicode="" d="m772 333l-741-412q-13-7-22-2t-9 20v822q0 14 9 20t22-2l741-412q13-7 13-17t-13-17z" horiz-adv-x="785.7" /> +<glyph glyph-name="play-circled2" unicode="" d="m661 350q0-21-18-31l-304-178q-8-5-18-5-8 0-17 4-18 11-18 31v358q0 20 18 31 18 10 35-1l304-178q18-10 18-31z m71 0q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="play-circled" unicode="" d="m429 779q116 0 215-58t156-156 57-215-57-215-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58z m214-460q18 10 18 31t-18 31l-304 178q-17 11-35 1-18-11-18-31v-358q0-20 18-31 9-4 17-4 10 0 18 5z" horiz-adv-x="857.1" /> +<glyph glyph-name="stop" unicode="" d="m857 743v-786q0-14-10-25t-26-11h-785q-15 0-25 11t-11 25v786q0 14 11 25t25 11h785q15 0 26-11t10-25z" horiz-adv-x="857.1" /> +<glyph glyph-name="cloud" unicode="" d="m1071 207q0-89-62-151t-152-63h-607q-103 0-177 73t-73 177q0 74 40 135t104 91q-1 15-1 24 0 118 84 202t202 84q88 0 159-50t105-128q39 35 93 35 59 0 101-42t42-101q0-42-23-77 72-17 119-75t46-134z" horiz-adv-x="1071.4" /> +<glyph glyph-name="table" unicode="" d="m286 82v107q0 8-5 13t-13 5h-179q-7 0-13-5t-5-13v-107q0-8 5-13t13-5h179q8 0 13 5t5 13z m0 214v108q0 7-5 12t-13 5h-179q-7 0-13-5t-5-12v-108q0-7 5-12t13-5h179q8 0 13 5t5 12z m285-214v107q0 8-5 13t-12 5h-179q-8 0-13-5t-5-13v-107q0-8 5-13t13-5h179q7 0 12 5t5 13z m-285 429v107q0 8-5 13t-13 5h-179q-7 0-13-5t-5-13v-107q0-8 5-13t13-5h179q8 0 13 5t5 13z m285-215v108q0 7-5 12t-12 5h-179q-8 0-13-5t-5-12v-108q0-7 5-12t13-5h179q7 0 12 5t5 12z m286-214v107q0 8-5 13t-13 5h-178q-8 0-13-5t-5-13v-107q0-8 5-13t13-5h178q8 0 13 5t5 13z m-286 429v107q0 8-5 13t-12 5h-179q-8 0-13-5t-5-13v-107q0-8 5-13t13-5h179q7 0 12 5t5 13z m286-215v108q0 7-5 12t-13 5h-178q-8 0-13-5t-5-12v-108q0-7 5-12t13-5h178q8 0 13 5t5 12z m0 215v107q0 8-5 13t-13 5h-178q-8 0-13-5t-5-13v-107q0-8 5-13t13-5h178q8 0 13 5t5 13z m72 178v-607q0-37-27-63t-63-26h-750q-36 0-63 26t-26 63v607q0 37 26 63t63 27h750q37 0 63-27t27-63z" horiz-adv-x="928.6" /> +<glyph glyph-name="off" unicode="" d="m857 350q0-87-34-166t-91-137-137-92-166-34-167 34-136 92-92 137-34 166q0 102 45 191t126 151q24 18 54 14t46-28q18-23 14-53t-28-47q-54-41-84-101t-30-127q0-58 22-111t62-91 91-61 111-23 110 23 92 61 61 91 22 111q0 68-30 127t-84 101q-24 18-28 47t14 53q17 24 47 28t53-14q81-61 126-151t45-191z m-357 429v-358q0-29-21-50t-50-21-51 21-21 50v358q0 29 21 50t51 21 50-21 21-50z" horiz-adv-x="857.1" /> +<glyph glyph-name="check" unicode="" d="m786 331v-177q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q35 0 65-14 9-4 10-13 2-10-5-16l-27-28q-6-5-13-5-2 0-5 1-13 3-25 3h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v141q0 8 5 13l36 35q6 6 13 6 3 0 7-2 11-4 11-16z m129 273l-455-454q-13-14-31-14t-32 14l-240 240q-14 13-14 31t14 32l61 62q14 13 32 13t32-13l147-147 361 361q13 13 31 13t32-13l62-61q13-14 13-32t-13-32z" horiz-adv-x="928.6" /> +<glyph glyph-name="asterisk" unicode="" d="m827 264q26-14 33-43t-7-55l-35-61q-15-26-44-33t-54 7l-149 85v-171q0-29-21-50t-50-22h-71q-29 0-51 22t-21 50v171l-148-85q-26-15-55-7t-43 33l-36 61q-14 26-7 55t34 43l148 86-148 86q-26 14-34 43t7 55l36 61q15 26 43 33t55-7l148-85v171q0 29 21 50t51 22h71q29 0 50-22t21-50v-171l149 85q26 15 54 7t44-33l35-62q15-25 7-54t-33-43l-148-86z" horiz-adv-x="928.6" /> +<glyph glyph-name="chart-bar" unicode="" d="m357 350v-286h-143v286h143z m214 286v-572h-142v572h142z m572-643v-72h-1143v858h71v-786h1072z m-357 500v-429h-143v429h143z m214 214v-643h-143v643h143z" horiz-adv-x="1142.9" /> +<glyph glyph-name="bug" unicode="" d="m911 314q0-14-11-25t-25-10h-125q0-96-37-162l116-117q10-11 10-25t-10-25q-10-11-25-11t-26 11l-110 110q-3-3-8-7t-24-16-36-21-46-16-54-7v500h-71v-500q-29 0-57 7t-49 19-36 22-25 18l-8 8-102-116q-11-12-27-12-13 0-24 9-11 10-11 25t8 26l113 127q-32 63-32 153h-125q-15 0-25 10t-11 25 11 25 25 11h125v164l-97 97q-11 10-11 25t11 25 25 10 25-10l97-97h471l96 97q11 10 25 10t26-10 10-25-10-25l-97-97v-164h125q15 0 25-11t11-25z m-268 322h-357q0 74 52 126t126 52 127-52 52-126z" horiz-adv-x="928.6" /> +<glyph glyph-name="certificate" unicode="" d="m768 350l77-75q17-16 11-39-7-23-29-29l-105-27 30-103q6-23-11-39-16-18-39-11l-104 30-27-105q-5-23-28-30-7-1-11-1-17 0-28 13l-75 77-76-77q-15-17-39-12-23 7-28 30l-27 105-104-30q-23-7-39 11-17 16-10 39l29 103-105 27q-22 6-29 29-6 23 11 39l77 75-77 75q-17 16-11 39 7 23 29 29l105 27-29 103q-7 23 10 39 16 18 39 11l104-29 27 104q5 23 28 29 23 7 39-11l76-77 75 77q16 17 39 11 23-6 28-29l27-104 104 29q23 7 39-11 17-16 11-39l-30-103 105-27q22-6 29-29 6-23-11-39z" horiz-adv-x="857.1" /> +<glyph glyph-name="tasks" unicode="" d="m571 64h358v72h-358v-72z m-214 286h572v71h-572v-71z m357 286h215v71h-215v-71z m286-465v-142q0-15-11-25t-25-11h-928q-15 0-25 11t-11 25v142q0 15 11 26t25 10h928q15 0 25-10t11-26z m0 286v-143q0-14-11-25t-25-10h-928q-15 0-25 10t-11 25v143q0 15 11 25t25 11h928q15 0 25-11t11-25z m0 286v-143q0-15-11-25t-25-11h-928q-15 0-25 11t-11 25v143q0 14 11 25t25 11h928q15 0 25-11t11-25z" horiz-adv-x="1000" /> +<glyph glyph-name="sort-up" unicode="" d="m571 457q0-14-10-25t-25-11h-500q-15 0-25 11t-11 25 11 25l250 250q10 11 25 11t25-11l250-250q10-10 10-25z" horiz-adv-x="571.4" /> +<glyph glyph-name="sort-down" unicode="" d="m571 243q0-15-10-25l-250-250q-11-11-25-11t-25 11l-250 250q-11 10-11 25t11 25 25 11h500q14 0 25-11t10-25z" horiz-adv-x="571.4" /> +<glyph glyph-name="sort" unicode="" d="m571 243q0-15-10-25l-250-250q-11-11-25-11t-25 11l-250 250q-11 10-11 25t11 25 25 11h500q14 0 25-11t10-25z m0 214q0-14-10-25t-25-11h-500q-15 0-25 11t-11 25 11 25l250 250q10 11 25 11t25-11l250-250q10-10 10-25z" horiz-adv-x="571.4" /> +<glyph glyph-name="gauge" unicode="" d="m214 207q0 30-21 51t-50 21-51-21-21-51 21-50 51-21 50 21 21 50z m107 250q0 30-20 51t-51 21-50-21-21-51 21-50 50-21 51 21 20 50z m239-268l57 213q3 14-5 27t-21 16-27-3-17-22l-56-213q-33-3-60-25t-35-55q-11-43 11-81t66-50 81 11 50 66q9 33-4 65t-40 51z m369 18q0 30-21 51t-51 21-50-21-21-51 21-50 50-21 51 21 21 50z m-358 357q0 30-20 51t-51 21-50-21-21-51 21-50 50-21 51 21 20 50z m250-107q0 30-20 51t-51 21-50-21-21-51 21-50 50-21 51 21 20 50z m179-250q0-145-79-269-10-17-30-17h-782q-20 0-30 17-79 123-79 269 0 102 40 194t106 160 160 107 194 39 194-39 160-107 106-160 40-194z" horiz-adv-x="1000" /> +<glyph glyph-name="spinner" unicode="" d="m277 100q0-33-24-57t-57-23q-33 0-56 23t-24 57 24 57 56 23q33 0 57-23t24-57z m241-107q0-30-21-51t-51-21-50 21-21 51 21 50 50 21 51-21 21-50z m-339 357q0-37-27-63t-63-26-63 26-26 63 26 63 63 26 63-26 27-63z m580-250q0-26-18-44t-45-18-44 18-18 44 18 44 44 19 45-19 18-44z m-464 500q0-41-29-69t-70-29-69 29-29 69 29 69 69 29 70-29 29-69z m259 107q0-45-32-76t-76-31-75 31-32 76 32 76 75 31 76-31 32-76z m303-357q0-22-15-38t-38-16-38 16-16 38 16 38 38 16 38-16 15-38z m-116 250q0-18-13-32t-32-13-31 13-13 32 13 31 31 14 32-14 13-31z" horiz-adv-x="875" /> +<glyph glyph-name="database" unicode="" d="m429 421q132 0 247 24t181 71v-95q0-38-57-71t-157-52-214-20-215 20-156 52-58 71v95q66-47 181-71t248-24z m0-428q132 0 247 24t181 71v-95q0-39-57-72t-157-52-214-19-215 19-156 52-58 72v95q66-47 181-71t248-24z m0 214q132 0 247 24t181 71v-95q0-38-57-71t-157-52-214-20-215 20-156 52-58 71v95q66-47 181-71t248-24z m0 643q116 0 214-19t157-52 57-72v-71q0-39-57-72t-157-52-214-19-215 19-156 52-58 72v71q0 39 58 72t156 52 215 19z" horiz-adv-x="857.1" /> +<glyph glyph-name="lifebuoy" unicode="" d="m500 850q102 0 194-40t160-106 106-160 40-194-40-194-106-160-160-106-194-40-194 40-160 106-106 160-40 194 40 194 106 160 160 106 194 40z m0-71q-106 0-201-51l108-108q46 16 93 16t93-16l108 108q-95 51-201 51z m-378-630l108 108q-16 46-16 93t16 93l-108 108q-51-95-51-201t51-201z m378-228q106 0 201 51l-108 108q-46-16-93-16t-93 16l-108-108q95-51 201-51z m0 215q89 0 152 63t62 151-62 152-152 62-151-62-63-152 63-151 151-63z m270 121l108-108q51 95 51 201t-51 201l-108-108q16-46 16-93t-16-93z" horiz-adv-x="1000" /> +<glyph glyph-name="cubes" unicode="" d="m357-61l214 107v176l-214-92v-191z m-36 254l226 96-226 97-225-97z m608-254l214 107v176l-214-92v-191z m-36 254l225 96-225 97-226-97z m-250 163l214 92v149l-214-92v-149z m-36 212l246 105-246 106-246-106z m607-289v-233q0-20-10-37t-29-26l-250-125q-14-8-32-8t-32 8l-250 125q-3 1-4 2-1-1-4-2l-250-125q-14-8-32-8t-31 8l-250 125q-19 9-29 26t-11 37v233q0 21 12 39t32 26l242 104v223q0 22 12 39t31 27l250 107q13 6 28 6t28-6l250-107q20-9 32-27t12-39v-223l242-104q20-9 32-26t11-40z" horiz-adv-x="1285.7" /> +<glyph glyph-name="cube" unicode="" d="m500-59l357 195v355l-357-130v-420z m-36 483l390 141-390 142-389-142z m465 140v-428q0-20-10-37t-28-26l-393-214q-15-9-34-9t-34 9l-393 214q-17 10-27 26t-10 37v428q0 23 13 41t34 26l393 143q12 5 24 5t25-5l393-143q21-8 34-26t13-41z" horiz-adv-x="1000" /> +<glyph glyph-name="bullseye" unicode="" d="m571 350q0-59-41-101t-101-42-101 42-42 101 42 101 101 42 101-42 41-101z m72 0q0 89-63 152t-151 62-152-62-63-152 63-151 152-63 151 63 63 151z m71 0q0-118-83-202t-202-84-202 84-84 202 84 202 202 84 202-84 83-202z m72 0q0 73-29 139t-76 114-114 76-138 28-139-28-114-76-76-114-29-139 29-139 76-113 114-77 139-28 138 28 114 77 76 113 29 139z m71 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="windows" unicode="" d="m381 289v-364l-381 53v311h381z m0 414v-367h-381v315z m548-414v-439l-507 70v369h507z m0 490v-443h-507v373z" horiz-adv-x="928.6" /> +<glyph glyph-name="cancel-circled-1" unicode="" d="m420 770q174 0 297-123t123-297-123-297-297-123-297 123-123 297 123 297 297 123z m86-420l154 154-86 86-154-152-152 152-88-86 154-154-154-152 88-86 152 152 154-152 86 86z" horiz-adv-x="840" /> +<glyph glyph-name="plus-1" unicode="" d="m550 400q30 0 30-50t-30-50l-210 0 0-210q0-30-50-30t-50 30l0 210-210 0q-30 0-30 50t30 50l210 0 0 210q0 30 50 30t50-30l0-210 210 0z" horiz-adv-x="580" /> +<glyph glyph-name="plus-circled-1" unicode="" d="m420 770q174 0 297-123t123-297-123-297-297-123-297 123-123 297 123 297 297 123z m52-470l200 0 0 102-200 0 0 202-102 0 0-202-202 0 0-102 202 0 0-202 102 0 0 202z" horiz-adv-x="840" /> +<glyph glyph-name="minus-1" unicode="" d="m550 400q30 0 30-50t-30-50l-520 0q-30 0-30 50t30 50l520 0z" horiz-adv-x="580" /> +<glyph glyph-name="minus-circled-1" unicode="" d="m420 770q174 0 297-123t123-297-123-297-297-123-297 123-123 297 123 297 297 123z m252-368l-504 0 0-102 504 0 0 102z" horiz-adv-x="840" /> +<glyph glyph-name="help-circled-1" unicode="" d="m454 810q190 2 326-130t140-322q2-190-131-327t-323-141q-190-2-327 131t-139 323q-4 190 130 327t324 139z m-2-740q30 0 49 19t19 47q2 30-17 49t-49 19l-2 0q-28 0-47-18t-21-46q0-30 19-49t47-21l2 0z m166 328q26 34 26 78 0 78-54 116-52 38-134 38-64 0-104-26-68-42-72-146l0-4 110 0 0 4q0 26 16 54 16 24 54 24 40 0 52-20 16-20 16-44 0-18-16-40-8-12-20-20l-6-4q-6-4-16-11t-20-15-21-17-17-17q-14-20-18-78l0-8 108 0 0 4q0 12 4 28 6 20 28 36l28 18q46 34 56 50z" horiz-adv-x="920" /> +<glyph glyph-name="heart-empty-1" unicode="" d="m790 642q70-64 70-156t-70-156l-360-330-360 330q-70 64-70 156t70 156q64 58 152 58t150-58l58-52 56 52q64 58 152 58t152-58z m-54-260q42 40 42 104 0 66-38 100-38 38-102 38-52 0-104-48l-104-92-106 92q-48 48-102 48-64 0-104-38-38-36-38-100 0-66 44-104l306-286z" horiz-adv-x="860" /> +<glyph glyph-name="mail-1" unicode="" d="m30 586q-32 18-28 40 2 14 26 14l846 0q38 0 20-32-8-14-24-22-14-6-192-102t-182-98q-16-10-46-10-28 0-46 10-4 2-182 98t-192 102z m850-100q20 10 20-10l0-368q0-16-17-32t-33-16l-800 0q-16 0-33 16t-17 32l0 368q0 20 20 10l384-200q18-10 46-10t46 10z" horiz-adv-x="900" /> +<glyph glyph-name="star-1" unicode="" d="m440 790l120-336 320 0-262-196 94-348-272 208-272-208 94 348-262 196 320 0z" horiz-adv-x="880" /> +<glyph glyph-name="star-empty-1" unicode="" d="m880 454l-262-196 94-348-272 208-272-208 94 348-262 196 320 0 120 336 120-336 320 0z m-440-238l150-124-62 178 144 114-176-4-56 202-54-202-176 4 142-114-62-178z" horiz-adv-x="880" /> +<glyph glyph-name="link-1" unicode="" d="m294 116q14 14 34 14t36-14q32-34 0-70l-42-40q-56-56-132-56-78 0-134 56t-56 132q0 78 56 134l148 148q70 68 144 77t128-43q16-16 16-36t-16-36q-36-32-70 0-50 48-132-34l-148-146q-26-26-26-64t26-62q26-26 63-26t63 26z m450 574q56-56 56-132 0-78-56-134l-158-158q-74-72-150-72-62 0-112 50-14 14-14 34t14 36q14 14 35 14t35-14q50-48 122 24l158 156q28 28 28 64 0 38-28 62-24 26-56 31t-60-21l-50-50q-16-14-36-14t-34 14q-34 34 0 70l50 50q54 54 127 51t129-61z" horiz-adv-x="800" /> +<glyph glyph-name="attach-1" unicode="" d="m244-140q-102 0-170 72-72 70-74 166t84 190l496 496q80 80 174 54 44-12 79-47t47-79q26-96-54-176l-474-474q-40-40-88-46-48-4-80 28-30 24-27 74t47 92l332 334q24 26 50 0t0-50l-332-332q-44-44-20-70 12-8 24-6 24 4 46 26l474 474q50 50 34 108-16 60-76 76-54 14-108-36l-494-494q-66-76-64-143t52-117q50-48 117-50t141 62l496 494q24 24 50 0 26-22 0-48l-496-496q-82-82-186-82z" horiz-adv-x="939" /> +<glyph glyph-name="eye-1" unicode="" d="m500 630q92 0 177-25t141-62 99-77 63-71 20-45-20-44-63-71-99-78-141-62-177-25-177 25-141 62-99 78-63 71-20 44 20 45 63 71 99 77 141 62 177 25z m0-494q92 0 157 63t65 151q0 90-65 153t-157 63-157-63-65-153q0-88 65-151t157-63z m0 214q8-8 37-2t50 11 25-9q0-44-33-75t-79-31-78 31-32 75q0 46 32 77t78 31q14 0 10-23t-12-47 2-38z" horiz-adv-x="1000" /> +<glyph glyph-name="attention-1" unicode="" d="m957-24q10-16 0-34-10-16-30-16l-892 0q-18 0-28 16-13 18-2 34l446 782q8 18 30 18t30-18z m-420 50l0 100-110 0 0-100 110 0z m0 174l0 300-110 0 0-300 110 0z" horiz-adv-x="962" /> +<glyph glyph-name="doc-text-1" unicode="" d="m212 308l0 90 280 0 0-90-280 0z m388 492q42 0 71-29t29-71l0-700q0-40-29-70t-71-30l-500 0q-40 0-70 30t-30 70l0 700q0 42 30 71t70 29l500 0z m0-800l0 700-500 0 0-700 500 0z m-110 592l0-88-280 0 0 88 280 0z m0-392l0-88-280 0 0 88 280 0z" horiz-adv-x="700" /> +<glyph glyph-name="doc-text-inv-1" unicode="" d="m600 800q42 0 71-29t29-71l0-700q0-40-29-70t-71-30l-500 0q-40 0-70 30t-30 70l0 700q0 42 30 71t70 29l500 0z m-460-208l0-88 420 0 0 88-420 0z m420-480l0 88-420 0 0-88 420 0z m0 196l0 90-418 0 0-90 418 0z" horiz-adv-x="700" /> +<glyph glyph-name="share-1" unicode="" d="m650 200q62 0 106-43t44-107q0-62-44-106t-106-44-106 44-44 106q0 6 1 14t1 12l-260 156q-42-32-92-32-62 0-106 44t-44 106 44 106 106 44q54 0 92-30l260 156q0 4-1 12t-1 12q0 62 44 106t106 44 106-43 44-107q0-62-44-106t-106-44q-52 0-90 32l-262-156q2-8 2-26 0-16-2-24l262-156q36 30 90 30z" horiz-adv-x="800" /> +<glyph glyph-name="shareable" unicode="" d="m340 350q0 68 47 114t113 46 113-46 47-114q0-66-47-113t-113-47-113 47-47 113z m-114 60q-14-60-66-60l-160 0 0 120 118 0q40 124 145 202t237 78q164 0 284-116 16-18 16-43t-16-43q-18-16-43-16t-43 16q-78 82-198 82-100 0-176-62t-98-158z m614-60l160 0 0-120-118 0q-40-124-144-202t-238-78q-164 0-282 118-18 18-18 43t18 41q16 18 41 18t43-18q82-82 198-82 100 0 176 63t98 157q12 60 66 60z" horiz-adv-x="1000" /> +<glyph glyph-name="ccw-1" unicode="" d="m532 736q170 0 289-120t119-290-119-290-289-120q-142 0-252 88l70 74q84-60 182-60 126 0 216 90t90 218-90 218-216 90q-124 0-214-87t-92-211l142 0-184-204-184 204 124 0q2 166 122 283t286 117z" horiz-adv-x="940" /> +<glyph glyph-name="cw-1" unicode="" d="m408 760q168 0 287-116t123-282l122 0-184-206-184 206 144 0q-4 124-94 210t-214 86q-126 0-216-90t-90-218q0-126 90-216t216-90q104 0 182 60l70-76q-110-88-252-88-168 0-288 120t-120 290 120 290 288 120z" horiz-adv-x="940" /> +<glyph glyph-name="arrows-ccw" unicode="" d="m186 140l116 116 0-292-276 16 88 86q-116 122-114 290t120 288q100 100 240 116l4-102q-100-16-172-88-88-88-90-213t84-217z m332 598l276-16-88-86q116-122 114-290t-120-288q-96-98-240-118l-2 104q98 16 170 88 88 88 90 213t-84 217l-114-116z" horiz-adv-x="820" /> +<glyph glyph-name="play-1" unicode="" d="m486 376q14-10 14-26 0-14-14-24l-428-266q-24-16-41-6t-17 40l0 514q0 30 17 40t41-6z" horiz-adv-x="500" /> +<glyph glyph-name="pause" unicode="" d="m440 700q90 0 90-64l0-570q0-66-90-66t-90 66l0 570q0 64 90 64z m-350 0q90 0 90-64l0-570q0-66-90-66t-90 66l0 570q0 64 90 64z" horiz-adv-x="530" /> +<glyph glyph-name="record" unicode="" d="m350 700q146 0 248-102t102-248q0-144-102-247t-248-103-248 103-102 247q0 146 102 248t248 102z" horiz-adv-x="700" /> +<glyph glyph-name="stop-1" unicode="" d="m526 650q74 0 74-64l0-470q0-66-74-66l-450 0q-76 0-76 66l0 470q0 36 18 50t58 14l450 0z" horiz-adv-x="600" /> +<glyph glyph-name="switch" unicode="" d="m700 592l0-140-500 0 0-90-200 160 200 170 0-100 500 0z m300-420l-200-160 0 90-500 0 0 140 500 0 0 100z" horiz-adv-x="1000" /> +<glyph glyph-name="loop" unicode="" d="m800 540q42 0 71-29t29-71l0-290q0-40-29-70t-71-30l-700 0q-40 0-70 30t-30 70l0 290q0 42 30 71t70 29l250 0 0 110 200-180-200-180 0 110-210 0 0-210 620 0 0 210-150 0 0 140 190 0z" horiz-adv-x="900" /> +<glyph glyph-name="cloud-1" unicode="" d="m760 494q100 0 170-68t70-166-70-166-170-68l-578 0q-74 0-128 52t-54 124q0 74 53 126t129 52q2 0 10-1t10-1q-2 12-2 38 0 108 78 184t188 76q90 0 160-52t94-134q28 4 40 4z" horiz-adv-x="1000" /> +<glyph glyph-name="certificate-outline" unicode="" d="m1019 395q22-15 22-44t-22-43l-96-64 51-104q14-26-3-49t-41-26l-115-7-7-117q-3-25-25-40t-50-2l-104 51-65-96q-16-24-43-24-27 0-43 24l-64 96-104-51q-26-14-49 2t-26 40l-7 117-117 7q-25 3-40 25t-2 50l51 104-96 64q-24 16-24 43t24 44l96 64-51 104q-14 27 2 50t40 25l117 7 7 115q3 25 26 41t49 3l104-51 64 96q13 21 43 21t43-21l65-96 104 51q26 14 50-3t25-41l7-115 115-7q25-3 41-25t3-50l-51-104z m-210-156q-9 17-4 36t21 30l70 46-70 47q-36 26-17 66l37 75-83 5q-20 1-34 15t-15 34l-5 83-75-37q-40-19-66 17l-47 70-46-70q-26-36-66-17l-75 37-5-83q-1-20-15-34t-34-15l-84-5 38-75q9-18 3-36t-22-30l-69-47 69-46q16-11 22-30t-3-36l-38-75 84-5q20-1 33-15t15-34l6-84 75 38q10 5 22 5 29 0 44-23l46-70 47 69q11 16 30 22t36-3l75-38 5 84q1 20 15 34t34 15l82 5z" horiz-adv-x="1041" /> +<glyph glyph-name="certificate-1" unicode="" d="m863 449l115-78q12-8 12-21t-12-21l-115-78 61-123q7-14-1-25t-20-13l-139-10-9-138q-1-12-12-20t-25-2l-124 62-78-116q-7-11-21-11t-21 11l-78 116-123-62q-14-6-25 2t-13 20l-10 139-137 9q-13 1-22 13t-1 25l63 123-117 78q-11 7-11 21t11 21l117 78-63 124q-7 12 1 24t22 13l137 9 10 139q1 12 13 20t25 1l123-61 78 116q7 11 21 11t21-11l78-116 124 61q13 7 25-1t12-20l9-139 139-9q12-1 20-12t1-25z" horiz-adv-x="990" /> +<glyph glyph-name="windows-1" unicode="" d="m0-43l105 371q35 20 86 31t83 13l34 1q50 0 104-10 101-20 144-61l-104-370q-36 28-79 45t-69 21l-26 4q-34 3-65 3-16 0-42-1t-84-14-87-33z m126 477l105 371q35 20 86 32t84 12l33 1q51 0 104-10 101-20 144-61l-104-371q-36 28-79 46t-69 20l-26 4q-35 3-64 3-16 0-42-1t-84-13-88-33z m431-513l104 371q37-28 81-45t68-21l25-4q34-3 65-3 16 0 43 2t84 13 86 32l-104-371q-35-20-86-31t-84-12l-33-2q-51 0-104 10-101 20-145 61z m120 475l104 370q37-28 81-45t68-21l25-4q34-3 65-3 16 0 43 2t83 13 87 32l-104-370q-35-20-86-31t-85-13l-33-2q-52 0-103 11-101 19-145 61z" horiz-adv-x="1233" /> +<glyph glyph-name="spin5" unicode="" d="m462 850c-6 0-11-5-11-11l0-183 0 0c0-6 5-11 11-11l69 0c1 0 1 0 1 0 7 0 12 5 12 11l0 183 0 0c0 6-5 11-12 11l-69 0c0 0 0 0-1 0z m250-47c-4 1-8-2-10-5l-91-158 0 0c-4-6-2-13 4-16l60-35c0 0 0 0 0 0 6-3 13-1 16 4l91 158c3 6 2 13-4 16l-61 35c-1 1-3 1-5 1z m-428-2c-2 0-4-1-6-2l-61-35c-5-3-7-10-4-16l91-157c0 0 0 0 0 0 3-6 10-8 16-5l61 35c5 4 7 11 4 16l-91 157c0 1 0 1 0 1-2 4-6 6-10 6z m620-163c-2 0-4 0-6-1l-157-91c0 0 0 0 0 0-6-3-8-10-5-16l35-61c4-5 11-7 16-4l157 91c1 0 1 0 1 0 6 3 7 10 4 16l-35 61c-2 3-6 5-10 5z m-810-4c-5 0-9-2-11-6l-35-61c-3-5-1-12 4-15l158-92 0 0c6-3 13-1 16 5l35 60c0 0 0 0 0 0 3 6 1 13-4 16l-158 91c-2 1-4 2-5 2z m712-235l0 0c-6 0-11-5-11-11l0-69c0-1 0-1 0-1 0-7 5-12 11-12l183 0 0 0c6 0 11 5 11 12l0 69c0 0 0 0 0 1 0 6-5 11-11 11l-183 0z m-794-5l0 0c-7 0-12-5-12-12l0-69c0 0 0 0 0-1 0-6 5-11 12-11l182 0 0 0c6 0 11 5 11 11l0 69c0 1 0 1 0 1 0 7-5 12-11 12l-182 0z m772-153c-4 0-8-2-10-6l-34-60c-1 0-1 0-1 0-3-6-1-13 4-16! l158-91c6-3 13-2 16 4l35 61c3 5 1 12-4 15l-158 91 0 0c-2 1-4 2-6 2z m-566-5c-1 0-3 0-5-1l-157-91c0 0-1 0-1 0-5-3-7-11-4-16l35-61c3-5 10-7 16-4l157 91c0 0 0 0 0 0 6 3 8 10 5 16l-35 61c-3 3-7 5-11 5z m468-121c-2 0-4 0-6-1l-61-35c-5-4-7-11-4-16l91-157c0-1 0-1 0-1 3-6 11-7 16-4l61 35c5 3 7 10 4 16l-91 157c0 0 0 0 0 0-2 4-6 6-10 6z m-367-3c-4 1-8-2-10-5l-91-158c-3-6-1-13 4-16l61-35c5-3 12-1 15 4l92 158 0 0c3 6 1 13-5 16l-60 34c0 1 0 1 0 1-2 1-4 1-6 1z m149-57c-7 0-12-5-12-11l0-183 0 0c0-6 5-11 12-11l69 0c0 0 0 0 1 0 6 0 11 5 11 11l0 183 0 0c0 6-5 11-11 11l-69 0c-1 0-1 0-1 0z" horiz-adv-x="1000" /> +<glyph glyph-name="spin2" unicode="" d="m46 144l0 0c0 0-1 0-1 0-8 18-15 37-21 55-6 19-11 38-15 58-19 99-8 203 35 298 3 6 10 8 15 5 1 0 2 0 2-1l0 0 80-59c5-3 6-9 4-14-5-12-9-25-12-38-4-12-7-26-9-39-11-67-3-137 23-201 2-5 0-10-4-13l0 0-80-56c-5-4-12-3-16 3-1 0-1 1-1 2l0 0z m120 574l0 0c0 1 0 1 0 1 15 13 30 25 46 37 16 11 33 22 51 31 89 50 192 72 297 60 6-1 10-6 10-13 0-1-1-1-1-2l0 0-31-94c-2-5-8-8-13-7-13 0-27 0-40 0-14-1-27-2-40-4-68-11-133-40-186-84-4-3-10-3-14 0l0 0-79 58c-5 3-6 11-2 16 0 0 1 1 2 1l0 0z m588 65l0 0c0 0 1 0 1 0 17-10 34-21 50-32 16-12 31-25 46-38 74-69 127-160 148-262 2-6-2-12-9-13-1 0-1 0-2 0l0 0-100 1c-5 0-10 4-11 9-3 13-8 26-12 38-5 12-10 25-17 36-31 61-78 113-137 150-5 3-6 8-5 13l0 0 31 92c2 6 9 9 15 7 1 0 2-1 2-1l0 0z m244-535l0 0c0 0 0 0 0 0-4-20-9-39-15-57-7-19-14-37-22-55-44-92-114-170-205-221-6-3-13-1-16 4 0 1-1 2-1 2l0 0-30 94c-2 6 1 12 6 14 11 7 22 15 32 23 11 9 21 18 30 27 49 48 84 109 101 176 2 5 6 8 11 8l0 0 98-1c6 0 11-5 11-11 0-1 0-2! 0-3l0 0z m-438-395l0 0c0 0 0 0 0 0-20-2-40-3-60-3-20 0-40 1-59 4-102 12-198 54-276 125-5 4-5 11 0 16 0 0 1 1 1 1l0 0 81 58c5 3 12 2 16-2 10-8 20-16 32-23 11-7 22-14 34-20 62-31 131-45 200-41 6 0 10-3 12-8l0 0 29-92c2-6-1-12-7-14-1-1-2-1-3-1l0 0z" horiz-adv-x="1000" /> +<glyph glyph-name="picture" unicode="" d="m357 529q0-45-31-76t-76-32-76 32-31 76 31 75 76 32 76-32 31-75z m572-215v-250h-786v107l178 179 90-89 285 285z m53 393h-893q-7 0-12-5t-6-13v-678q0-8 6-13t12-5h893q7 0 13 5t5 13v678q0 7-5 13t-13 5z m89-18v-678q0-37-26-63t-63-27h-893q-36 0-63 27t-26 63v678q0 37 26 63t63 27h893q37 0 63-27t26-63z" horiz-adv-x="1071.4" /> +<glyph glyph-name="menu" unicode="" d="m857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" /> +<glyph glyph-name="sliders" unicode="" d="m196 64v-71h-196v71h196z m197 72q14 0 25-11t11-25v-143q0-14-11-25t-25-11h-143q-14 0-25 11t-11 25v143q0 15 11 25t25 11h143z m89 214v-71h-482v71h482z m-357 286v-72h-125v72h125z m732-572v-71h-411v71h411z m-536 643q15 0 26-10t10-26v-142q0-15-10-26t-26-10h-142q-15 0-26 10t-10 26v142q0 15 10 26t26 10h142z m358-286q14 0 25-10t10-25v-143q0-15-10-25t-25-11h-143q-15 0-25 11t-11 25v143q0 14 11 25t25 10h143z m178-71v-71h-125v71h125z m0 286v-72h-482v72h482z" horiz-adv-x="857.1" /> +<glyph glyph-name="list-alt" unicode="" d="m214 189v-35q0-8-5-13t-13-5h-35q-7 0-13 5t-5 13v35q0 8 5 13t13 5h35q8 0 13-5t5-13z m0 143v-36q0-7-5-12t-13-5h-35q-7 0-13 5t-5 12v36q0 7 5 13t13 5h35q8 0 13-5t5-13z m0 143v-36q0-7-5-12t-13-6h-35q-7 0-13 6t-5 12v36q0 7 5 13t13 5h35q8 0 13-5t5-13z m643-286v-35q0-8-5-13t-13-5h-535q-8 0-13 5t-5 13v35q0 8 5 13t13 5h535q8 0 13-5t5-13z m0 143v-36q0-7-5-12t-13-5h-535q-8 0-13 5t-5 12v36q0 7 5 13t13 5h535q8 0 13-5t5-13z m0 143v-36q0-7-5-12t-13-6h-535q-8 0-13 6t-5 12v36q0 7 5 13t13 5h535q8 0 13-5t5-13z m72-393v464q0 8-6 13t-12 5h-822q-7 0-12-5t-6-13v-464q0-7 6-12t12-6h822q7 0 12 6t6 12z m71 607v-607q0-37-26-63t-63-26h-822q-36 0-63 26t-26 63v607q0 37 26 63t63 27h822q37 0 63-27t26-63z" horiz-adv-x="1000" /> +<glyph glyph-name="ajust" unicode="" d="m429 46v608q-83 0-153-41t-110-111-41-152 41-152 110-111 153-41z m428 304q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="circle" unicode="" d="m857 350q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="circle-empty" unicode="" d="m429 654q-83 0-153-41t-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152-41 152-110 111-152 41z m428-304q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> +<glyph glyph-name="circle-notch" unicode="" d="m1000 350q0-102-40-194t-106-160-160-106-194-40-194 40-160 106-106 160-40 194q0 124 56 231t155 177 218 87v-145q-124-25-205-124t-81-226q0-73 28-139t77-114 113-76 139-28 139 28 114 76 76 114 28 139q0 128-81 226t-205 124v145q120-17 218-87t155-177 56-231z" horiz-adv-x="1000" /> +<glyph glyph-name="fork" unicode="" d="m161 29q0 22-16 38t-38 15-38-15-15-38 15-38 38-16 38 16 16 38z m0 642q0 23-16 38t-38 16-38-16-15-38 15-38 38-15 38 15 16 38z m357-71q0 22-16 38t-38 16-38-16-15-38 15-38 38-16 38 16 16 38z m53 0q0-29-14-54t-39-39q-1-160-126-231-38-21-114-45-71-22-94-39t-23-56v-15q24-14 39-39t14-53q0-45-31-76t-76-32-76 32-31 76q0 29 15 53t39 39v458q-25 14-39 39t-15 53q0 45 31 76t76 32 76-32 31-76q0-29-14-53t-39-39v-278q30 15 86 32 30 10 49 17t39 17 33 22 22 29 16 38 5 51q-25 14-39 39t-15 54q0 45 31 76t76 31 76-31 31-76z" horiz-adv-x="571.4" /> +<glyph glyph-name="sitemap" unicode="" d="m1000 154v-179q0-22-16-38t-38-16h-178q-22 0-38 16t-16 38v179q0 22 16 38t38 15h53v107h-285v-107h53q23 0 38-15t16-38v-179q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v179q0 22 16 38t38 15h53v107h-285v-107h53q22 0 38-15t16-38v-179q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v179q0 22 16 38t38 15h53v107q0 29 21 51t51 21h285v107h-53q-23 0-38 15t-16 38v179q0 22 16 38t38 16h178q23 0 38-16t16-38v-179q0-22-16-38t-38-15h-53v-107h285q29 0 51-21t21-51v-107h53q23 0 38-15t16-38z" horiz-adv-x="1000" /> +<glyph glyph-name="stethoscope" unicode="" d="m714 457q0 15-10 25t-25 11-26-11-10-25 10-25 26-11 25 11 10 25z m72 0q0-34-20-62t-52-39v-220q0-89-73-152t-177-63-176 63-74 152v73q-91 12-153 72t-61 140v286q0 15 11 25t25 11q3 0 9-1 9 16 26 27t36 10q30 0 51-21t21-51-21-50-51-21q-18 0-36 10v-225q0-59 53-101t126-41 126 41 53 101v225q-18-10-36-10-30 0-51 21t-21 50 21 51 51 21q19 0 36-10t26-27q6 1 9 1 15 0 25-11t11-25v-286q0-80-61-140t-153-72v-73q0-59 52-101t126-42 126 42 53 101v220q-32 12-52 39t-20 62q0 45 32 76t76 31 75-31 32-76z" horiz-adv-x="785.7" /> +<glyph glyph-name="shield" unicode="" d="m607 314v357h-250v-634q67 35 119 76 131 103 131 201z m107 429v-429q0-48-18-95t-47-84-66-71-70-57-68-43-50-28-23-11q-7-4-15-4t-14 4q-9 4-24 11t-50 28-68 43-70 57-66 71-46 84-19 95v429q0 14 11 25t25 11h643q14 0 25-11t10-25z" horiz-adv-x="714.3" /> +<glyph glyph-name="heart-1" unicode="" d="m790 644q70-64 70-156t-70-158l-360-330-360 330q-70 66-70 158t70 156q62 58 151 58t153-58l56-52 58 52q62 58 150 58t152-58z" horiz-adv-x="860" /> +<glyph glyph-name="search-1" unicode="" d="m772 78q30-34 6-62l-46-46q-36-32-68 0l-190 190q-74-42-156-42-128 0-223 95t-95 223 90 219 218 91 224-95 96-223q0-88-46-162z m-678 358q0-88 68-156t156-68 151 63 63 153q0 88-68 155t-156 67-151-63-63-151z" horiz-adv-x="789" /> +<glyph glyph-name="menu-1" unicode="" d="m650 400q22 0 36-15t14-35-15-35-35-15l-600 0q-20 0-35 15t-15 35 14 35 36 15l600 0z m-600 100q-20 0-35 15t-15 35 14 35 36 15l600 0q22 0 36-15t14-35-15-35-35-15l-600 0z m600-300q22 0 36-15t14-35-15-35-35-15l-600 0q-20 0-35 15t-15 35 14 35 36 15l600 0z" horiz-adv-x="700" /> +<glyph glyph-name="back" unicode="" d="m750 540q40 0 70-29t30-71l0-290q0-40-30-70t-70-30l-690 0 0 140 650 0 0 210-500 0 0-110-210 180 210 180 0-110 540 0z" horiz-adv-x="850" /> +<glyph glyph-name="home-1" unicode="" d="m888 336q16-16 11-27t-27-11l-84 0 0-310q0-14-1-21t-8-13-23-6l-204 0 0 310-204 0 0-310-194 0q-28 0-35 10t-7 30l0 310-84 0q-22 0-27 11t11 27l400 402q16 16 38 16t38-16z" horiz-adv-x="900" /> +<glyph glyph-name="pencil-1" unicode="" d="m718 680q32-32 47-64t15-48l0-16-252-252-290-288-238-52 50 240 290 288 252 252q54 12 126-60z m-494-640l24 24q-2 44-52 94-22 22-45 35t-35 13l-14 2-22-24-18-80q28-16 46-34 24-24 36-48z" horiz-adv-x="780" /> +<glyph glyph-name="location-1" unicode="" d="m250 750q104 0 177-73t73-177q0-106-62-243t-126-223l-62-84q-10 12-27 35t-60 89-76 130-60 147-27 149q0 104 73 177t177 73z m0-388q56 0 96 40t40 96-40 95-96 39-95-39-39-95 39-96 95-40z" horiz-adv-x="500" /> +<glyph glyph-name="logout-1" unicode="" d="m502 0l0 100 98 0 0-100q0-40-29-70t-71-30l-400 0q-40 0-70 30t-30 70l0 700q0 42 30 71t70 29l400 0q42 0 71-29t29-71l0-150-98 0 0 150-402 0 0-700 402 0z m398 326l-198-196 0 120-450 0 0 150 450 0 0 120z" horiz-adv-x="900" /> +<glyph glyph-name="login-1" unicode="" d="m800 800q42 0 71-29t29-71l0-700q0-40-29-70t-71-30l-450 0q-40 0-69 30t-29 70l0 100 98 0 0-100 450 0 0 700-450 0 0-150-98 0 0 150q0 42 29 71t69 29l450 0z m-350-670l0 120-450 0 0 150 450 0 0 120 200-194z" horiz-adv-x="900" /> +<glyph glyph-name="publish" unicode="" d="m900 800q42 0 71-30t29-70l0-600q0-42-29-71t-71-29l-198 0 0 98 200 0 0 462-802 0 0-462 200 0 0-98-200 0q-40 0-70 29t-30 71l0 600q0 40 30 70t70 30l800 0z m-770-168q38 0 38 38 0 16-11 26t-27 10-27-11-11-25q0-16 11-27t27-11z m100 0q38 0 38 38 0 16-11 26t-27 10-27-11-11-25q0-16 11-27t27-11z m672 6l0 62-602 0 0-62 602 0z m-404-198l242-240-150 0 0-300-184 0 0 300-150 0z" horiz-adv-x="1000" /> +<glyph glyph-name="window" unicode="" d="m900 750q42 0 71-30t29-70l0-600q0-42-29-71t-71-29l-800 0q-40 0-70 29t-30 71l0 600q0 40 30 70t70 30l800 0z m-670-94q-16 0-27-11t-11-25q0-16 11-27t27-11q38 0 38 38 0 16-11 26t-27 10z m-138-36q0-16 11-27t27-11q38 0 38 38 0 16-11 26t-27 10-27-11-11-25z m810-570l0 460-802 0 0-460 802 0z m0 540l0 60-602 0 0-60 602 0z" horiz-adv-x="1000" /> +<glyph glyph-name="chart-pie" unicode="" d="m368 770l0-368-368 0q18 146 121 249t247 119z m106 0q156-20 261-139t105-279q0-174-123-298t-299-124q-160 0-278 105t-140 263l424 0q20 0 35 14t15 36l0 422z" horiz-adv-x="840" /> +<glyph glyph-name="chart-line" unicode="" d="m34 284q-42 10-32 56 10 42 54 32l98-24-52-80z m890-12q14 12 33 11t31-15q32-32-2-64l-252-226q-12-12-30-12-14 0-28 10l-286 220-54 14 50 80 36-8q12-4 16-8l264-204z m-490 220l-350-550q-12-22-38-22-12 0-24 8-16 10-20 29t6 33l374 588q8 16 28 20 18 6 36-6l246-156 226 326q10 16 28 19t34-9q38-24 12-62l-252-362q-24-36-62-12z" horiz-adv-x="1003" /> +<glyph glyph-name="chart-area" unicode="" d="m964 732q16 22 16-4l0-768-964 0q-12 0-15 7t5 17l230 288q20 22 40 2l74-66q10-8 21-7t17 11l158 238q16 26 38 4l112-104q20-20 38 4z" horiz-adv-x="980" /> +<glyph glyph-name="chart-bar-1" unicode="" d="m750 800q22 0 36-15t14-35l0-850-200 0 0 850q0 50 40 50l110 0z m-300-300q22 0 36-15t14-35l0-550-200 0 0 550q0 50 40 50l110 0z m-300-300q22 0 36-15t14-35l0-250-200 0 0 250q0 50 40 50l110 0z" horiz-adv-x="800" /> +<glyph glyph-name="air" unicode="" d="m85 534q-16-14-36-12t-34 18q-14 14-12 36t18 36q48 40 79 60t89 40 129 4 159-66 155-53 100 16 89 67q38 30 70-6 32-40-6-72-122-110-234-110-100 0-222 70-68 38-119 52t-93 0-65-29-67-51z m736-110q38 32 70-6 32-40-6-72-40-34-65-53t-72-38-97-19q-96 0-222 70-68 38-119 52t-93 0-65-29-67-51q-14-14-35-12t-35 18q-32 40 6 72 38 34 60 50t69 38 88 23 105-15 134-56q68-38 119-52t93 0 65 29 67 51z m0-256q38 32 70-6 14-14 12-36t-18-36q-40-34-65-53t-72-38-97-19q-96 0-222 70-68 38-119 52t-93 1-66-29-66-52q-14-14-35-12t-35 18q-32 40 6 72 38 34 60 50t69 38 88 23 105-15 134-56q68-38 119-52t93 0 65 29 67 51z" horiz-adv-x="905" /> +<glyph glyph-name="database-1" unicode="" d="m686 208q14 20 14-2l0-100q0-74-104-135t-246-61q-140 0-245 61t-105 135l0 100q0 8 4 10t10-8q32-52 125-86t211-34 211 34 125 86z m2 254q8 16 12 0l0-116q0-68-102-114t-248-46q-144 0-247 46t-103 114l0 116q0 20 14 0 30-46 124-75t212-29 212 29 126 75z m-338 328q144 0 247-39t103-93l0-64q0-58-103-99t-247-41-247 41-103 99l0 64q0 54 103 93t247 39z" horiz-adv-x="700" /> +<glyph glyph-name="flow-cascade" unicode="" d="m520 120q50 0 85-35t35-85-35-85-85-35q-80 0-110 74l-164 0q-88 0-131 54t-43 118l0 464q-72 34-72 110 0 50 35 85t85 35 85-35 35-85q0-76-72-110l0-114q0-78 78-78l164 0q30 72 110 72 50 0 85-35t35-85-35-85-85-35q-80 0-110 74l-164 0q-42 0-78 16l0-194q0-78 78-78l164 0q30 72 110 72z m0 300q-28 0-49-20t-21-50q0-28 21-48t49-20 49 20 21 48q0 30-21 50t-49 20z m-470 280q0-28 21-48t49-20 49 20 21 48q0 30-21 50t-49 20-49-20-21-50z m470-768q28 0 49 20t21 48q0 30-21 50t-49 20-49-20-21-50q0-28 21-48t49-20z" horiz-adv-x="640" /> +<glyph glyph-name="flow-tree" unicode="" d="m868 112q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 114q0 78-76 78l-100 0q-44 0-78 12l0-204q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 204q-30-12-76-12l-100 0q-34 0-53-19t-22-33-3-26l0-114q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 114q0 64 43 118t131 54l100 0q76 0 76 52l0 140q-72 34-72 110 0 50 35 85t85 35 85-35 35-85q0-76-72-110l0-140q0-52 78-52l100 0q86 0 129-54t43-118l0-114z m-678-112q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20 49 20 21 48z m212 700q0-28 20-48t48-20 49 20 21 48q0 30-21 50t-49 20-48-20-20-50z m138-700q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20 49 20 21 48z m280-68q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z" horiz-adv-x="940" /> +<glyph glyph-name="flow-line" unicode="" d="m168 162q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 378q-72 34-72 110 0 50 35 85t85 35 85-35 35-85q0-76-72-110l0-378z m-116 488q0-28 20-48t48-20 49 20 21 48q0 30-21 50t-49 20-48-20-20-50z m68-668q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z" horiz-adv-x="240" /> +<glyph glyph-name="flow-branch" unicode="" d="m640 650q0-80-74-110-6-58-28-101t-61-69-68-38-75-26q-42-14-63-22t-47-24-38-40-16-60q70-30 70-110 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 378q-72 34-72 110 0 50 35 85t85 35 85-35 35-85q0-76-72-110l0-204q40 30 138 60 58 18 84 29t51 41 29 76q-70 32-70 108 0 50 35 85t85 35 85-35 35-85z m-588 0q0-28 20-48t48-20 49 20 21 48q0 30-21 50t-49 20-48-20-20-50z m68-668q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z m400 600q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z" horiz-adv-x="640" /> +<glyph glyph-name="flow-parallel-1" unicode="" d="m240 650q0-76-72-110l0-378q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 378q-72 34-72 110 0 50 35 85t85 35 85-35 35-85z m-50-600q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20 49 20 21 48z m-70 532q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z m448-420q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 378q-72 34-72 110 0 50 35 85t85 35 85-35 35-85q0-76-72-110l0-378z m-116 488q0-28 20-48t48-20 49 20 21 48q0 30-21 50t-49 20-48-20-20-50z m68-668q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z" horiz-adv-x="640" /> +<glyph glyph-name="dot" unicode="" d="m110 460q46 0 78-32t32-78q0-44-32-77t-78-33-78 33-32 77q0 46 32 78t78 32z" horiz-adv-x="220" /> +<glyph glyph-name="dot-3" unicode="" d="m110 460q46 0 78-32t32-78q0-44-32-77t-78-33-78 33-32 77q0 46 32 78t78 32z m350 0q46 0 78-32t32-78q0-44-33-77t-77-33-77 33-33 77q0 46 32 78t78 32z m350 0q46 0 78-32t32-78q0-44-32-77t-78-33-78 33-32 77q0 46 32 78t78 32z" horiz-adv-x="920" /> +<glyph glyph-name="cd" unicode="" d="m460 810q190 0 325-135t135-325-135-325-325-135-325 135-135 325 135 325 325 135z m0-610q62 0 106 44t44 106q0 64-43 107t-107 43q-62 0-106-44t-44-106 44-106 106-44z" horiz-adv-x="920" /> +<glyph glyph-name="back-in-time" unicode="" d="m532 760q170 0 289-120t119-290-119-290-289-120q-138 0-252 88l70 76q82-60 182-60 126 0 216 90t90 216q0 128-90 218t-216 90q-124 0-213-86t-93-210l142 0-184-206-184 206 124 0q4 166 123 282t285 116z m-36-190l70 0 0-204 130-130-50-50-150 150 0 234z" horiz-adv-x="940" /> +<glyph glyph-name="list" unicode="" d="m100 200q20 0 35-15t15-35-15-35-35-15l-50 0q-20 0-35 15t-15 35 14 35 36 15l50 0z m0 200q20 0 35-15t15-35-15-35-35-15l-50 0q-20 0-35 15t-15 35 14 35 36 15l50 0z m0 200q20 0 35-15t15-35-15-35-35-15l-50 0q-20 0-35 15t-15 35 14 35 36 15l50 0z m200-100q-20 0-35 15t-15 35 15 35 35 15l350 0q22 0 36-15t14-35-15-35-35-15l-350 0z m350-100q22 0 36-15t14-35-15-35-35-15l-350 0q-20 0-35 15t-15 35 15 35 35 15l350 0z m0-200q22 0 36-15t14-35-15-35-35-15l-350 0q-20 0-35 15t-15 35 15 35 35 15l350 0z" horiz-adv-x="700" /> +<glyph glyph-name="list-add" unicode="" d="m350 400q22 0 36-15t14-35-15-35-35-15l-300 0q-20 0-35 15t-15 35 14 35 36 15l300 0z m0-200q22 0 36-15t14-35-15-35-35-15l-300 0q-20 0-35 15t-15 35 14 35 36 15l300 0z m620 200q30 0 30-50t-30-50l-170 0 0-170q0-30-50-30t-50 30l0 170-164 0q-30 0-30 50t30 50l164 0 0 170q0 30 50 30t50-30l0-170 170 0z m-620 200q22 0 36-15t14-35-15-35-35-15l-300 0q-20 0-35 15t-15 35 14 35 36 15l300 0z" horiz-adv-x="1000" /> +<glyph glyph-name="progress-0" unicode="" d="m1000 450l0-250q0-42-29-71t-71-29l-800 0q-40 0-70 29t-30 71l0 300q0 40 30 70t70 30l800 0q42 0 71-30t29-70l0-50z m-100-250l0 300-800 0 0-300 800 0z" horiz-adv-x="1000" /> +<glyph glyph-name="pencil-2" unicode="" d="m0-143l68 343 274-273z m137 392l422 422 259-260-421-422z m531 494q2 39 31 69t69 31 66-26l131-130q25-26 24-66t-30-69-69-30-66 24l-131 131q-27 27-25 66z" horiz-adv-x="989" /> +<glyph glyph-name="cog-2" unicode="" d="m0 272l0 156 150 16q14 45 38 88l-96 117 109 109 117-95q41 23 88 37l16 150 156 0 16-150q45-14 88-37l117 95 109-109-96-117q24-43 38-88l150-16 0-156-150-16q-14-47-38-88l96-117-109-109-117 96q-43-24-88-38l-16-150-156 0-16 150q-47 14-88 38l-117-96-109 109 96 117q-24 41-38 88z m355 78q0-60 42-102t103-42 103 42 42 102-42 103-103 42-103-42-42-103z" horiz-adv-x="1000" /> +<glyph glyph-name="cog-circled" unicode="" d="m0 350q0 207 147 354t353 146 354-146 146-354-146-354-354-146-353 146-147 354z m195-47l92-10q8-29 22-52l-59-73 68-68 73 59q23-14 52-22l10-92 94 0 10 92q29 8 52 22l73-59 68 68-59 73q14 23 22 52l92 10 0 94-92 10q-8 29-22 52l59 73-68 68-73-59q-23 14-52 22l-10 92-94 0-10-92q-29-8-52-22l-73 59-68-68 59-73q-14-23-22-52l-92-10 0-94z m217 47q0 37 26 63t62 25 63-25 25-63-25-62-63-26-62 26-26 62z" horiz-adv-x="1000" /> +<glyph glyph-name="cogs" unicode="" d="m0 245l0 97 94 8q8 30 23 55l-60 74 68 69 74-61q26 16 55 23l8 94 97 0 10-94q29-7 55-23l74 61 68-69-60-74q16-25 23-55l94-8 0-97-94-10q-7-29-23-55l60-72-68-70-74 60q-26-15-55-23l-10-94-97 0-8 94q-29 8-55 23l-74-60-68 70 60 72q-15 26-23 55z m221 49q0-37 26-64t64-26 63 26 26 64-26 63-63 26-64-26-26-63z m318 238l8 72 70-2q8 22 20 39l-37 57 54 45 49-49q20 10 41 14l14 66 72-8-2-68q22-8 39-22l57 39 45-54-49-49q10-20 12-43l68-14-8-70-68 0q-8-20-22-37l39-59-56-45-47 49q-22-8-43-12l-14-66-70 6 0 70q-20 8-37 20l-59-37-45 54 49 49q-8 20-12 41z m31-446l6 51 49 0q6 16 14 28l-26 43 37 33 36-37q13 7 29 9l10 49 48-6 0-48q16-6 28-16l41 27 31-41-35-35q6-14 10-29l47-12-6-51-49 0q-4-15-14-27l28-43-40-33-35 37q-13-8-29-10l-10-49-49 6 0 51q-13 4-27 14l-41-28-31 41 35 35q-6 14-8 30z m118 14q-4-21 8-36t32-18 34 10 17 33-10 36-31 18l-6 0q-17 0-31-13t-13-30z m17 451q-4-27 14-49t45-24 48 15 23 45-14 47-44 25l-7 0q-26 0-44-17t-21-42z" horiz-adv-x="1000" /> +<glyph glyph-name="calendar-1" unicode="" d="m0-150l0 649 893 0 0-649-893 0z m0 705l0 221 109 0 0-141 200 0 0 141 275 0 0-141 199 0 0 141 110 0 0-221-893 0z m168 139l0 156 82 0 0-156-82 0z m59-619q0-112 123-112 47 0 84 32 39 31 39 80 0 68-78 90 48 15 64 48 12 28-2 73-27 62-107 62-51 0-86-26t-37-77l72 0q0 45 49 46 43 0 45-52 0-49-84-47l0-57q48 0 68-8 23-11 23-46 0-57-54-61-43 0-47 55l-72 0z m281 146q49 14 88 47l0-297 70 0 0 371-64 0q-38-37-94-58l0-63z m135 473l0 156 82 0 0-156-82 0z" horiz-adv-x="893" /> +<glyph glyph-name="doc-new" unicode="" d="m0-150l0 818 188 182 519 0 0-348-86 0 0 260-369 0 0-156-166 0 0-668 418 0 0-88-504 0z m373 207l0 162 209 0 0 207 160 0 0-207 207 0 0-162-207 0 0-207-160 0 0 207-209 0z" horiz-adv-x="949" /> +</font> +</defs> +</svg> \ No newline at end of file diff --git a/ui/fontello/font/fontello.ttf b/ui/fontello/font/fontello.ttf new file mode 100644 index 0000000000000000000000000000000000000000..c1167906ee073765a9d01aead457c4b25c530735 GIT binary patch literal 42532 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 P^z$#-zOUl!Fe&{XToHil literal 0 HcmV?d00001 diff --git a/ui/fontello/font/fontello.woff b/ui/fontello/font/fontello.woff new file mode 100644 index 0000000000000000000000000000000000000000..e0007cf3c54b81e62aeaeec8976b8feb2e5a21c0 GIT binary patch literal 24196 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 G0002s37CTb literal 0 HcmV?d00001 diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 844234d..7355737 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -31,6 +31,8 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <link rel="shortcut icon" href="images/logo.ico"> <link rel="stylesheet" href="$href('libs/themes/base/jquery-ui.min.css')"> +<link rel="stylesheet" href="$href('fontello/css/fontello.css')"> +<link rel="stylesheet" href="$href('fontello/css/animation.css')"> <link rel="stylesheet" href="$href('css/theme-default.min.css')"> <script src="$href('libs/jquery-1.10.0.min.js')"></script> -- 1.7.1

3 3

[PATCH V5] UI: Adding widget of gauge
by Wen Wang 03 Feb '15

03 Feb '15

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V4 -> V5: 1) Change all the tabs into 4 spaces 2) Adding the license to the header of the sample 3) Change the sample file name the same as the widget 4) Deleted white spaces 5) Specify Sample independently V3 -> V4: 1) Add comments of how to use the widget. 2) Minor style changes. V2 -> V3: Adding Samples of gauge. V1 -> V2: Change the time of the copyright. New widget accept two options: "value" and "color". value varies from 0 to 100 and color contains "red", "blue", "yellow" and "purple". Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/gauge-flat.css | 52 ++++++++++++++ ui/js/widgets/gauge-flat.js | 126 ++++++++++++++++++++++++++++++++++ ui/js/widgets/samples/gauge-flat.html | 53 ++++++++++++++ 3 files changed, 231 insertions(+) create mode 100755 ui/css/theme-default/gauge-flat.css create mode 100755 ui/js/widgets/gauge-flat.js create mode 100644 ui/js/widgets/samples/gauge-flat.html diff --git a/ui/css/theme-default/gauge-flat.css b/ui/css/theme-default/gauge-flat.css new file mode 100755 index 0000000..f5b52e5 --- /dev/null +++ b/ui/css/theme-default/gauge-flat.css @@ -0,0 +1,52 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +.ui-gauge-flat { + height: 15px; + width: 100px; + text-align: left; + overflow: hidden; + background: #E6E7E8; + border: 0 none; + border-radius: 0; +} + +.ui-gauge-flat .ui-gauge-flat-value { + margin: -1px; + height: 100%; + border-radius: 0; +} + +.ui-gauge-flat .red { + background: #D9182D; + border:1px solid #D9182D; +} + +.ui-gauge-flat .blue { + background: #008ABF; + border:1px solid #008ABF; +} + +.ui-gauge-flat .yellow { + background: #FDB813; + border:1px solid #FDB813; +} + +.ui-gauge-flat .purple { + background: #7F1C7D; + border:1px solid #7F1C7D; +} \ No newline at end of file diff --git a/ui/js/widgets/gauge-flat.js b/ui/js/widgets/gauge-flat.js new file mode 100755 index 0000000..2b807ae --- /dev/null +++ b/ui/js/widgets/gauge-flat.js @@ -0,0 +1,126 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * How to use: + * $(".selector").gaugeFlat({ + * value: 25, // Value that you the gauge is going to show, varies from 0 to 100. + * color: "red" // Color showed, currently only "red", "yellow", "blue" and "purple" are supported. + * }); + * + * Set value: + * $(".selector").gaugeFlat("value", <value>); // Replace <value> with the value that is going to be showed. + * + * Get value: + * $(".selector").gaugeFlat("value"); // This returns the value of gauge. + * + */ + +(function( $ ) { + +return $.widget( "kimchi.gaugeFlat", { + version: "@VERSION", + options: { + max: 100, + value: 0, + color: "red" + }, + + min: 0, + + _create: function() { + this.oldValue = this.options.value = this._constrainedValue(); + + this.element + .addClass( "ui-gauge-flat ui-widget ui-widget-content ui-corner-all" ) + .attr({ + role: "gaugeflat", + "aria-valuemin": this.min + }); + var color = this.options.color; + if(color != "red" && color != "yellow" && color != "blue" && color != "purple") { + color = "red"; + } + + this.valueDiv = $( "<div class='ui-gauge-flat-value " + color + " ui-widget-header ui-corner-left'></div>" ) + .appendTo( this.element ); + + this._refreshValue(); + }, + + _destroy: function() { + this.element + .removeClass( "ui-gauge-flat ui-widget ui-widget-content ui-corner-all" ) + .removeAttr( "role" ) + .removeAttr( "aria-valuemin" ) + .removeAttr( "aria-valuemax" ) + .removeAttr( "aria-valuenow" ); + + this.valueDiv.remove(); + }, + + value: function( newValue ) { + if ( newValue === undefined ) { + return this.options.value; + } + + this.options.value = this._constrainedValue( newValue ); + this._refreshValue(); + }, + + _constrainedValue: function( newValue ) { + if ( newValue === undefined ) { + newValue = this.options.value; + } + + this.indeterminate = newValue === false; + + if ( typeof newValue !== "number" ) { + newValue = 0; + } + + return this.indeterminate ? false : + Math.min( this.options.max, Math.max( this.min, newValue ) ); + }, + + _setOptions: function( options ) { + var value = options.value; + delete options.value; + + this._super( options ); + + this.options.value = this._constrainedValue( value ); + this._refreshValue(); + }, + + _percentage: function() { + return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min ); + }, + + _refreshValue: function() { + var value = this.options.value, + percentage = this._percentage(); + + this.valueDiv + .toggle( this.indeterminate || value > this.min ) + .toggleClass( "ui-corner-right", value === this.options.max ) + .width( percentage.toFixed(0) + "%" ); + } +}); + +})(jQuery); diff --git a/ui/js/widgets/samples/gauge-flat.html b/ui/js/widgets/samples/gauge-flat.html new file mode 100644 index 0000000..92ce07a --- /dev/null +++ b/ui/js/widgets/samples/gauge-flat.html @@ -0,0 +1,53 @@ + + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Gauge Demo</title> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../gauge-flat.js"></script> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/gauge-flat.css"> + </head> + <body> + <div class="gauge-demo"></div> + <script> + $(document).ready(function() { + console.log("test started1"); + var gauged = $(".gauge-demo"); + gauged.gaugeFlat({ + value: 25, + color: "red" + }); + var gaugeAdd = function() { + var gaugeValue = gauged.gaugeFlat("value"); + gauged.gaugeFlat("value", gaugeValue + 1); + if (gaugeValue < 99) { + setTimeout(gaugeAdd, 300); + } + } + gaugeAdd(); + }); + </script> + </body> +</html> \ No newline at end of file -- 2.1.0

2 1

[PATCH v2 0/4] Transient Object Handling
by Christy Perez 03 Feb '15

03 Feb '15

In order to prevent benign error messages from the user, some POST requests for transient objects should be handled as special cases. This patchset introduces a way to catch an error on the subsequent GET after a POST, and also implments it for the three types of transient objects that Kimchi deals with: VMs, Networks, and Storage Pools. Christy Perez (4): Handle requests differently for transient objects Transient VM POST request handling Transient Network POST request handling Transient StoragePool POST request handling src/kimchi/control/base.py | 13 +++++++++---- src/kimchi/control/networks.py | 11 +++++++++-- src/kimchi/control/storagepools.py | 11 +++++++++-- src/kimchi/control/vms.py | 18 ++++++++++++++---- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 6 +++++- src/kimchi/model/storagepools.py | 8 ++++++-- src/kimchi/model/vms.py | 9 ++++++++- 8 files changed, 61 insertions(+), 16 deletions(-) -- 1.9.3

2 8

[PATCH] Issue #573: Kimchi on ppc64el
by Ramon Medeiros 03 Feb '15

03 Feb '15

Old name: Supports Kimchi on LE systems v5 review now: Changes: v5: Fix pep8 style issues v4: Add ppc64le to distroloaders, avoiding to select a template with a mismatch architecture v3: Create a new entry for ppc64le arch Create key for keyboard type v2: Improve coding by removing duplicated actions Fix typo On LE systems, some changes on libvirt xml is needed. The input device for keyboard is not kbd anymore, the architecture is still ppc64 and the qemu binary is not qemu-kvm as in the other archs. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/config.py.in | 11 +++++++++-- src/kimchi/distroloader.py | 3 ++- src/kimchi/osinfo.py | 34 ++++++++++++++++++++++++++++++---- src/kimchi/vmtemplate.py | 4 +++- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index a952fb3..f2e1cac 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -68,12 +68,19 @@ def find_qemu_binary(find_emulator=False): raise Exception("Unable to get qemu binary location: %s" % e) try: xml = connect.getCapabilities() + + # On Little Endian system, the qemu binary is + # qemu-system-ppc64, not qemu-system-ppc64le as expected + arch = platform.machine() + if arch == "ppc64le": + arch = "ppc64" + if find_emulator: expr = "/capabilities/guest/arch[@name='%s']\ - /emulator" % platform.machine() + /emulator" % arch else: expr = "/capabilities/guest/arch[@name='%s']\ - /domain[@type='kvm']/emulator" % platform.machine() + /domain[@type='kvm']/emulator" % arch res = xpath_get_text(xml, expr) location = res[0] except Exception, e: diff --git a/src/kimchi/distroloader.py b/src/kimchi/distroloader.py index 64505f4..5e56999 100644 --- a/src/kimchi/distroloader.py +++ b/src/kimchi/distroloader.py @@ -30,7 +30,8 @@ from kimchi.utils import kimchi_log ARCHS = {'x86_64': ['x86_64', 'amd64', 'i686', 'x86', 'i386'], 'amd64': ['x86_64', 'amd64', 'i686', 'x86', 'i386'], - 'ppc64': ['ppc', 'ppc64']} + 'ppc64': ['ppc', 'ppc64'], + 'ppc64le': ['ppc64', 'ppc64le']} class DistroLoader(object): diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 0e16b50..56a11e1 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -29,7 +29,8 @@ from kimchi.config import paths SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), - 'power': ('ppc', 'ppc64')} + 'power': ('ppc', 'ppc64'), + 'ppc64le': ('ppc64le')} common_spec = {'cpus': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], @@ -47,13 +48,30 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', 'power': {'old': dict(common_spec, disk_bus='scsi', nic_model='spapr-vlan', cdrom_bus='scsi', + kbd_type="kbd", kbd_bus='usb', mouse_bus='usb', tablet_bus='usb', memory=1280), 'modern': dict(common_spec, disk_bus='virtio', nic_model='virtio', - cdrom_bus='scsi', kbd_bus='usb', + cdrom_bus='scsi', + kbd_bus='usb', + kbd_type="kbd", mouse_bus='usb', tablet_bus='usb', - memory=1280)}} + memory=1280)}, + 'ppc64le': {'old': dict(common_spec, disk_bus='virtio', + nic_model='virtio', + cdrom_bus='scsi', + kbd_bus='usb', + kbd_type="keyboard", + mouse_bus='usb', tablet_bus='usb', + memory=1280), + 'modern': dict(common_spec, disk_bus='virtio', + nic_model='virtio', + cdrom_bus='scsi', + kbd_bus='usb', + kbd_type="keyboard", + mouse_bus='usb', tablet_bus='usb', + memory=1280)}} modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', @@ -63,7 +81,11 @@ modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'power': {'rhel': '6.5', 'fedora': '19', 'ubuntu': '14.04', 'opensuse': '13.1', - 'sles': '11sp3'}} + 'sles': '11sp3'}, + 'ppc64le': {'rhel': '6.5', 'fedora': '19', + 'ubuntu': '14.04', + 'opensuse': '13.1', + 'sles': '11sp3'}} icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' @@ -94,6 +116,10 @@ def lookup(distro, version): params['os_version'] = version arch = _get_arch() + # set up arch to ppc64 instead of ppc64le due to libvirt compatibility + if params["arch"] == "ppc64le": + params["arch"] = "ppc64" + if distro in modern_version_bases[arch]: if LooseVersion(version) >= LooseVersion( modern_version_bases[arch][distro]): diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index e41a959..0a3f8ea 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -245,9 +245,11 @@ class VMTemplate(object): mouse = """ <input type='mouse' bus='%(mouse_bus)s'/> """ + keyboard = """ - <input type='kbd' bus='%(kbd_bus)s'> </input> + <input type='%(kbd_type)s' bus='%(kbd_bus)s'> </input> """ + tablet = """ <input type='tablet' bus='%(kbd_bus)s'> </input> """ -- 1.8.3.1

2 1

[v2 0/2] UI: Line Chart(With Sample)
by huoyuxin＠linux.vnet.ibm.com 03 Feb '15

03 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): UI: Line Chart Widget UI: Line Chart Sample ui/css/theme-default/line.css | 34 ++++++++ ui/js/widgets/line.js | 72 +++++++++++++++++ ui/js/widgets/samples/line.html | 168 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 274 insertions(+), 0 deletions(-) create mode 100644 ui/css/theme-default/line.css create mode 100644 ui/js/widgets/line.js create mode 100644 ui/js/widgets/samples/line.html

3 4

[PATCH] test_model: using default pool in test_vm_disk
by Daniel Henrique Barboza 03 Feb '15

03 Feb '15

In certain conditions and/or libvirt versions, the hot plug of disks won't work unless the disk belongs to the default pool. This patch fixes github bug #507: https://github.com/kimchi-project/kimchi/issues/507 Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- tests/test_model.py | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index c956007..c27e138 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -329,9 +329,6 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): - disk_path = '/tmp/existent2.iso' - open(disk_path, 'w').close() - def _attach_disk(expect_bus='virtio'): disk_args = {"type": "disk", "pool": pool, @@ -343,30 +340,13 @@ class ModelTests(unittest.TestCase): # Check the bus type to be 'virtio' disk_info = inst.vmstorage_lookup(vm_name, disk) self.assertEquals(u'disk', disk_info['type']) - self.assertEquals(vol_path, disk_info['path']) self.assertEquals(expect_bus, disk_info['bus']) return disk inst = model.Model(objstore_loc=self.tmp_store) with RollbackContext() as rollback: - path = os.path.join(os.getcwd(), 'kimchi-images') - pool = 'test-pool' vol = 'test-volume.img' - vol_path = "%s/%s" % (path, vol) - if not os.path.exists(path): - os.mkdir(path) - rollback.prependDefer(shutil.rmtree, path) - - args = {'name': pool, - 'path': path, - 'type': 'dir'} - inst.storagepools_create(args) - rollback.prependDefer(inst.storagepool_delete, pool) - - # Activate the pool before adding any volume - inst.storagepool_activate(pool) - rollback.prependDefer(inst.storagepool_deactivate, pool) - + pool = 'default' params = {'name': vol, 'capacity': 1073741824, # 1 GiB 'allocation': 536870912, # 512 MiB @@ -409,7 +389,7 @@ class ModelTests(unittest.TestCase): disk_args = {"type": "disk", "pool": pool, "vol": vol, - "path": disk_path} + "path": '/disk/path.img'} self.assertRaises( InvalidParameter, inst.vmstorages_create, vm_name, disk_args) -- 1.9.3

3 7

[PATCH v4 0/4] Transient Object Handling
by Christy Perez 02 Feb '15

02 Feb '15

In order to prevent benign error messages from being displayed to the user, some POST requests for transient objects should be handled as special cases. This patchset introduces a way to mark an action as destructive so that the subsequent GET after a POST is bypassed. It also adds that logic to the three types of transient objects that Kimchi deals with: VMs, Networks, and Storage Pools. It also prevents Delete from being called on a VM, but does not need to prevent delete for the other objects as it does not apply. Christy Perez (4): Handle requests differently for transient objects Transient VM POST request handling Transient Network POST request handling Transient StoragePool POST request handling src/kimchi/control/base.py | 15 ++++++++++----- src/kimchi/control/networks.py | 3 ++- src/kimchi/control/storagepools.py | 4 ++-- src/kimchi/control/vms.py | 9 ++++++--- src/kimchi/i18n.py | 1 + src/kimchi/model/vms.py | 3 +++ 6 files changed, 24 insertions(+), 11 deletions(-) -- 1.9.3

3 6

[PATCH v4] On Ubuntu, current libvirt library requires <os><type arch=
by thierry＠linux.vnet.ibm.com 02 Feb '15

02 Feb '15

From: Thierry Fauck <thierry(a)linux.vnet.ibm.com> On Ubuntu, current libvirt library requires <os><type arch= specification to avoid a failure in virDomainDefineXML() and messages like - libvirtError: internal error: no supported architecture for os type 'hvm' on x86_64 arch - libvirtError: XML error: No PCI buses available on ppc64el arch Signed-off-by: Thierry Fauck <thierry(a)linux.vnet.ibm.com> modified: src/kimchi/kvmusertests.py modified: src/kimchi/model/featuretests.py --- src/kimchi/kvmusertests.py | 16 +++++++++++----- src/kimchi/model/featuretests.py | 15 +++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 2326727..fe7388a 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -16,24 +16,25 @@ # 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 platform import psutil import uuid - import libvirt from kimchi.rollbackcontext import RollbackContext +from kimchi.utils import kimchi_log class UserTests(object): SIMPLE_VM_XML = """ <domain type='kvm'> - <name>%s</name> - <uuid>%s</uuid> + <name>%(vm_name)s</name> + <uuid>%(vm_uuid)s</uuid> <memory unit='KiB'>262144</memory> <os> - <type>hvm</type> + <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> </os> </domain>""" @@ -46,8 +47,12 @@ class UserTests(object): vm_uuid = uuid.uuid1() vm_name = "kimchi_test_%s" % vm_uuid + arch = 'ppc64' if platform.machine() == 'ppc64le' \ + else platform.machine() + + xml = cls.SIMPLE_VM_XML % {'vm_name': vm_name, 'vm_uuid': vm_uuid, + 'arch': arch} - xml = cls.SIMPLE_VM_XML % (vm_name, vm_uuid) with RollbackContext() as rollback: conn = libvirt.open(None) rollback.prependDefer(conn.close) diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index c187f86..bbd741d 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -20,6 +20,7 @@ import cherrypy import libvirt import lxml.etree as ET +import platform import socket import subprocess import threading @@ -37,7 +38,7 @@ ISO_STREAM_XML = """ <name>ISO_STREAMING</name> <memory unit='KiB'>1048576</memory> <os> - <type>hvm</type> + <type arch='%(arch)s'>hvm</type> <boot dev='cdrom'/> </os> <devices> @@ -59,7 +60,7 @@ SIMPLE_VM_XML = """ <name>A_SIMPLE_VM</name> <memory unit='KiB'>10240</memory> <os> - <type>hvm</type> + <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> </os> </domain>""" @@ -102,7 +103,10 @@ class FeatureTests(object): @staticmethod def libvirt_supports_iso_stream(conn, protocol): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol} + arch = 'ppc64' if platform.machine() == 'ppc64le' \ + else platform.machine() + xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol, + 'arch': arch} try: FeatureTests.disable_libvirt_error_logging() dom = conn.defineXML(xml) @@ -190,7 +194,10 @@ class FeatureTests(object): FeatureTests.disable_libvirt_error_logging() rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type}) + arch = 'ppc64' if platform.machine() == 'ppc64le' \ + else platform.machine() + dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, + 'arch': arch}) rollback.prependDefer(dom.undefine) try: dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT,

2 1

[PATCH V4] UI: Adding widget of gauge
by Wen Wang 02 Feb '15

02 Feb '15

V3 -> V4: 1) Add comments of how to use the widget. 2) Minor style changes. V2 -> V3: Adding Samples of gauge. V1 -> V2: Change the time of the copyright. New widget accept two options: "value" and "color". value varies from 0 to 100 and color contains "red", "blue", "yellow" and "purple". Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/gauge-flat.css | 52 +++++++++++++ ui/js/widgets/gauge-flat.js | 127 ++++++++++++++++++++++++++++++++ ui/js/widgets/samples/gauge-sample.html | 34 +++++++++ 3 files changed, 213 insertions(+) create mode 100755 ui/css/theme-default/gauge-flat.css create mode 100755 ui/js/widgets/gauge-flat.js create mode 100644 ui/js/widgets/samples/gauge-sample.html diff --git a/ui/css/theme-default/gauge-flat.css b/ui/css/theme-default/gauge-flat.css new file mode 100755 index 0000000..f5b52e5 --- /dev/null +++ b/ui/css/theme-default/gauge-flat.css @@ -0,0 +1,52 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +.ui-gauge-flat { + height: 15px; + width: 100px; + text-align: left; + overflow: hidden; + background: #E6E7E8; + border: 0 none; + border-radius: 0; +} + +.ui-gauge-flat .ui-gauge-flat-value { + margin: -1px; + height: 100%; + border-radius: 0; +} + +.ui-gauge-flat .red { + background: #D9182D; + border:1px solid #D9182D; +} + +.ui-gauge-flat .blue { + background: #008ABF; + border:1px solid #008ABF; +} + +.ui-gauge-flat .yellow { + background: #FDB813; + border:1px solid #FDB813; +} + +.ui-gauge-flat .purple { + background: #7F1C7D; + border:1px solid #7F1C7D; +} \ No newline at end of file diff --git a/ui/js/widgets/gauge-flat.js b/ui/js/widgets/gauge-flat.js new file mode 100755 index 0000000..c073a2f --- /dev/null +++ b/ui/js/widgets/gauge-flat.js @@ -0,0 +1,127 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * How to use: + * $(".selector").gaugeFlat({ + * value: 25, // Value that you the gauge is going to show, varies from 0 to 100. + * color: "red" // Color showed, currently only "red", "yellow", "blue" and "purple" are supported. + * }); + * + * Set value: + * $(".selector").gaugeFlat("value", <value>); // Replace <value> with the value that is going to be showed. + * + * Get value: + * $(".selector").gaugeFlat("value"); // This returns the value of gauge. + * + */ + +(function( $ ) { + +return $.widget( "kimchi.gaugeFlat", { + version: "@VERSION", + options: { + max: 100, + value: 0, + color: "red" + }, + + min: 0, + + _create: function() { + this.oldValue = this.options.value = this._constrainedValue(); + + this.element + .addClass( "ui-gauge-flat ui-widget ui-widget-content ui-corner-all" ) + .attr({ + role: "gaugeflat", + "aria-valuemin": this.min + }); + var color = this.options.color; + if(color != "red" && color != "yellow" && color != "blue" && color != "purple") { + color = "red"; + } + + + this.valueDiv = $( "<div class='ui-gauge-flat-value " + color + " ui-widget-header ui-corner-left'></div>" ) + .appendTo( this.element ); + + this._refreshValue(); + }, + + _destroy: function() { + this.element + .removeClass( "ui-gauge-flat ui-widget ui-widget-content ui-corner-all" ) + .removeAttr( "role" ) + .removeAttr( "aria-valuemin" ) + .removeAttr( "aria-valuemax" ) + .removeAttr( "aria-valuenow" ); + + this.valueDiv.remove(); + }, + + value: function( newValue ) { + if ( newValue === undefined ) { + return this.options.value; + } + + this.options.value = this._constrainedValue( newValue ); + this._refreshValue(); + }, + + _constrainedValue: function( newValue ) { + if ( newValue === undefined ) { + newValue = this.options.value; + } + + this.indeterminate = newValue === false; + + if ( typeof newValue !== "number" ) { + newValue = 0; + } + + return this.indeterminate ? false : + Math.min( this.options.max, Math.max( this.min, newValue ) ); + }, + + _setOptions: function( options ) { + var value = options.value; + delete options.value; + + this._super( options ); + + this.options.value = this._constrainedValue( value ); + this._refreshValue(); + }, + + _percentage: function() { + return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min ); + }, + + _refreshValue: function() { + var value = this.options.value, + percentage = this._percentage(); + + this.valueDiv + .toggle( this.indeterminate || value > this.min ) + .toggleClass( "ui-corner-right", value === this.options.max ) + .width( percentage.toFixed(0) + "%" ); + } +}); + +})(jQuery); diff --git a/ui/js/widgets/samples/gauge-sample.html b/ui/js/widgets/samples/gauge-sample.html new file mode 100644 index 0000000..971d9a8 --- /dev/null +++ b/ui/js/widgets/samples/gauge-sample.html @@ -0,0 +1,34 @@ + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Gauge Demo</title> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../gauge-flat.js"></script> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/gauge-flat.css"> + </head> + <body> + <div class="gauge-demo"></div> + <script> + $(document).ready(function() { + console.log("test started1"); + var gauged = $(".gauge-demo"); + gauged.gaugeFlat({ + value: 25, + color: "red" + }); + var gaugeAdd = function() { + var gaugeValue = gauged.gaugeFlat("value"); + gauged.gaugeFlat("value", gaugeValue + 1); + if (gaugeValue < 99) { + setTimeout(gaugeAdd, 300); + } + } + gaugeAdd(); + }); + </script> + </body> +</html> \ No newline at end of file -- 2.1.0

2 2

[PATCH v3] On Ubuntu, current libvirt library requires <os><type arch=
by thierry＠linux.vnet.ibm.com 02 Feb '15

02 Feb '15

From: Thierry Fauck <thierry(a)linux.vnet.ibm.com> On Ubuntu, current libvirt library requires <os><type arch= specification to avoid a failure in virDomainDefineXML() and messages like - libvirtError: internal error: no supported architecture for os type 'hvm' on x86_64 arch - libvirtError: XML error: No PCI buses available on ppc64el arch Signed-off-by: Thierry Fauck <thierry(a)linux.vnet.ibm.com> modified: src/kimchi/kvmusertests.py modified: src/kimchi/model/featuretests.py --- src/kimchi/kvmusertests.py | 16 +++++++++++----- src/kimchi/model/featuretests.py | 15 +++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 2326727..c54d585 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -16,24 +16,25 @@ # 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 platform import psutil import uuid - import libvirt from kimchi.rollbackcontext import RollbackContext +from kimchi.utils import kimchi_log class UserTests(object): SIMPLE_VM_XML = """ <domain type='kvm'> - <name>%s</name> - <uuid>%s</uuid> + <name>%(vm_name)s</name> + <uuid>%(vm_uuid)s</uuid> <memory unit='KiB'>262144</memory> <os> - <type>hvm</type> + <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> </os> </domain>""" @@ -46,8 +47,13 @@ class UserTests(object): vm_uuid = uuid.uuid1() vm_name = "kimchi_test_%s" % vm_uuid + arch = 'ppc64' if platform.machine() == 'ppc64le' \ + else platform.machine() + + xml = cls.SIMPLE_VM_XML % {'vm_name': vm_name, 'vm_uuid': vm_uuid, + 'arch': arch} + kimchi_log.warning("DEBUG XML %s", xml) - xml = cls.SIMPLE_VM_XML % (vm_name, vm_uuid) with RollbackContext() as rollback: conn = libvirt.open(None) rollback.prependDefer(conn.close) diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index c187f86..bbd741d 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -20,6 +20,7 @@ import cherrypy import libvirt import lxml.etree as ET +import platform import socket import subprocess import threading @@ -37,7 +38,7 @@ ISO_STREAM_XML = """ <name>ISO_STREAMING</name> <memory unit='KiB'>1048576</memory> <os> - <type>hvm</type> + <type arch='%(arch)s'>hvm</type> <boot dev='cdrom'/> </os> <devices> @@ -59,7 +60,7 @@ SIMPLE_VM_XML = """ <name>A_SIMPLE_VM</name> <memory unit='KiB'>10240</memory> <os> - <type>hvm</type> + <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> </os> </domain>""" @@ -102,7 +103,10 @@ class FeatureTests(object): @staticmethod def libvirt_supports_iso_stream(conn, protocol): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol} + arch = 'ppc64' if platform.machine() == 'ppc64le' \ + else platform.machine() + xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol, + 'arch': arch} try: FeatureTests.disable_libvirt_error_logging() dom = conn.defineXML(xml) @@ -190,7 +194,10 @@ class FeatureTests(object): FeatureTests.disable_libvirt_error_logging() rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type}) + arch = 'ppc64' if platform.machine() == 'ppc64le' \ + else platform.machine() + dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, + 'arch': arch}) rollback.prependDefer(dom.undefine) try: dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, -- 2.1.0

2 1